Bug 1122302 - Fix bustage: Work around removed variable after rebase. r=me
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 13 Mar 2015 14:35:45 -0700
changeset 233744 e1269f306413a41b6fc9879a76b18335c3b656b6
parent 233743 48a7bd3146e3449722dd16e2f40231ffdb8dfdf8
child 233745 092e01b0561fde56d6090166b4bf255fb0c817f5
push id28423
push userphilringnalda@gmail.com
push dateMon, 16 Mar 2015 02:35:36 +0000
treeherdermozilla-central@436686833af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1122302
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1122302 - Fix bustage: Work around removed variable after rebase. r=me
mobile/android/base/widget/GeckoActionProvider.java
--- a/mobile/android/base/widget/GeckoActionProvider.java
+++ b/mobile/android/base/widget/GeckoActionProvider.java
@@ -144,20 +144,18 @@ public class GeckoActionProvider {
         final int count = dataModel.getActivityCount();
         for (int i = 0; i < count; i++) {
             ResolveInfo activity = dataModel.getActivity(i);
             final CharSequence activityLabel = activity.loadLabel(packageManager);
 
             // Pin internal actions to the top. Note:
             // the order here does not affect quick share.
             final int order;
-            if (i < MAX_HISTORY_SIZE) {
-                order = i | Menu.CATEGORY_CONTAINER;
-            } else if (shareDialogClassName.equals(activity.activityInfo.name) &&
-                       sendTabLabel.equals(activityLabel)) {
+            if (shareDialogClassName.equals(activity.activityInfo.name) &&
+                    sendTabLabel.equals(activityLabel)) {
                 order = i;
             } else {
                 order = i | Menu.CATEGORY_SECONDARY;
             }
 
             subMenu.add(0, i, order, activityLabel)
                 .setIcon(activity.loadIcon(packageManager))
                 .setOnMenuItemClickListener(mCallbacks);