Bug 1122302 - Fix bustage: Work around removed variable after rebase. r=me a=sylvestre
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 13 Mar 2015 14:35:45 -0700
changeset 257975 538f346c00b60a68b5d5fd8f66b7f0a74ad06620
parent 257974 87465191828f2dd96e9bfadb78f2d04426e19b22
child 257976 fbf1c776fa91ad4a28a246d895f8f6b9160f0ed2
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, sylvestre
bugs1122302
milestone38.0a2
Bug 1122302 - Fix bustage: Work around removed variable after rebase. r=me a=sylvestre
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);