Bug 1140210 - Fix build errors after rebase. r=me

--HG--
extra : commitid : EInQJfzClsE
extra : rebase_source : 53dac9bb8aaa299e7c150440c97b5a7b32e02864

mobile/android/base/menu/GeckoMenu.java

@@ -228,8 +228,8 @@ public class GeckoMenu extends ListView
                 mItems.add(menuItem);
             }
         } else if (actionEnum == GeckoMenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW) {
-            if (actionView instanceof MenuItemActionView) {
-                final MenuItemActionView quickShareView = (MenuItemActionView) actionView;
+            if (actionView instanceof MenuItemSwitcherLayout) {
+                final MenuItemSwitcherLayout quickShareView = (MenuItemSwitcherLayout) actionView;
 
                 // We don't want to add the quick share bar if we don't have any quick share items.
                 if (quickShareView.getActionButtonCount() > 0 &&

mobile/android/base/menu/QuickShareBarActionView.java

@@ -19,10 +19,10 @@ import org.mozilla.gecko.R;
  * uplifted, and this implementation will soon be replaced with the old implementation for adding
  * the share plane to the menu (see https://bug1122302.bugzilla.mozilla.org/attachment.cgi?id=8572126).
  */
-public class QuickShareBarActionView extends MenuItemActionView {
+public class QuickShareBarActionView extends MenuItemSwitcherLayout {
 
     public QuickShareBarActionView(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.menuItemActionViewStyle);
+        this(context, attrs, R.attr.menuItemSwitcherLayoutStyle);
     }
 
     @TargetApi(14)