Bug 1197428 - Remove UrlBar.ImageButton.Icon style and change inheritors. r=mcomella

mobile/android/base/resources/layout-large-v11/browser_toolbar.xml

@@ -134,7 +134,10 @@
          which is thus drawn on top, may be pressed. -->
     <org.mozilla.gecko.widget.themed.ThemedImageView
             android:id="@+id/edit_cancel"
-            style="@style/UrlBar.ImageButton.Icon"
+            style="@style/UrlBar.ImageButton"
+            android:layout_width="@dimen/browser_toolbar_icon_width"
+            android:layout_height="@dimen/browser_toolbar_height"
+            android:layout_weight="0.0"
             android:layout_alignParentRight="true"
             android:src="@drawable/close_edit_mode_selector"
             android:contentDescription="@string/edit_mode_cancel"

mobile/android/base/resources/values/styles.xml

@@ -496,13 +496,6 @@
         <item name="android:layout_width">@dimen/browser_toolbar_height</item>
     </style>
 
-    <!-- URL bar - Image Button - Icon -->
-    <style name="UrlBar.ImageButton.Icon">
-         <item name="android:layout_width">@dimen/browser_toolbar_icon_width</item>
-         <item name="android:layout_height">@dimen/browser_toolbar_height</item>
-         <item name="android:layout_weight">0.0</item>
-    </style>
-
     <!-- TabsLayout -->
     <style name="TabsLayoutBase">
          <item name="android:background">@android:color/transparent</item>

mobile/android/base/toolbar/PageActionLayout.java

@@ -162,7 +162,7 @@ public class PageActionLayout extends LinearLayout implements NativeEventListene
         ThreadUtils.assertOnUiThread();
 
         final int width = mContext.getResources().getDimensionPixelSize(R.dimen.page_action_button_width);
-        ImageButton imageButton = new ImageButton(mContext, null, R.style.UrlBar_ImageButton_Icon);
+        ImageButton imageButton = new ImageButton(mContext, null, R.style.UrlBar_ImageButton);
         imageButton.setLayoutParams(new LayoutParams(width, LayoutParams.MATCH_PARENT));
         imageButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
         imageButton.setOnClickListener(this);