Add update menu item and app menu icon badge

chrome/android/java/res/layout-sw600dp/toolbar.xml

Index: chrome/android/java/res/layout-sw600dp/toolbar.xml
diff --git a/chrome/android/java/res/layout-sw600dp/toolbar.xml b/chrome/android/java/res/layout-sw600dp/toolbar.xml
index a60efe7912376f9cf04ed60af88d7e5a6d18c984..1c051bd43ffc9b88ebc61f1af0dba69bc64195aa 100644
--- a/chrome/android/java/res/layout-sw600dp/toolbar.xml
+++ b/chrome/android/java/res/layout-sw600dp/toolbar.xml
@@ -12,32 +12,38 @@
     android:layout_height="@dimen/toolbar_height_no_shadow"
     android:layout_marginTop="@dimen/tab_strip_height"
     android:background="@color/default_primary_color" >
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingStart="4dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal" >
+
         <org.chromium.chrome.browser.toolbar.HomePageButton
             android:id="@+id/home_button"
             style="@style/ToolbarButton"
             android:src="@drawable/btn_toolbar_home"
             android:contentDescription="@string/accessibility_toolbar_btn_home"
             android:visibility="gone" />
+
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/back_button"
             style="@style/ToolbarButton"
             android:src="@drawable/btn_back"
             android:contentDescription="@string/accessibility_toolbar_btn_back" />
+
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/forward_button"
             style="@style/ToolbarButton"
             android:src="@drawable/btn_forward"
             android:contentDescription="@string/accessibility_toolbar_btn_forward" />
+
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/refresh_button"
             style="@style/ToolbarButton"
             android:src="@drawable/btn_toolbar_reload"
             android:contentDescription="@string/accessibility_btn_refresh" />
+
         <org.chromium.chrome.browser.omnibox.LocationBarTablet
             android:id="@+id/location_bar"
             android:layout_width="0dp"
@@ -48,19 +54,34 @@
             android:layout_gravity="top|center"
             android:background="@drawable/textbox"
             android:paddingEnd="1dp"
-            android:paddingStart="2dp"
-        />
+            android:paddingStart="2dp" />
+
         <ImageButton
             android:id="@+id/tab_switcher_button"
             style="@style/ToolbarButton"
             android:contentDescription="@string/accessibility_toolbar_btn_tabswitcher_toggle"
             android:visibility="gone" />
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/menu_button"
-            style="@style/ToolbarButton"
-            android:src="@drawable/btn_menu"
-            android:contentDescription="@string/accessibility_toolbar_btn_menu"
-            android:layout_width="43dp"
-            android:paddingEnd="3.5dp" />
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/menu_button_wrapper" >
+
+            <org.chromium.chrome.browser.widget.TintedImageButton
+                android:id="@+id/menu_button"
+                style="@style/ToolbarButton"
+                android:src="@drawable/btn_menu"
+                android:contentDescription="@string/accessibility_toolbar_btn_menu"
+                android:layout_width="43dp"
+                android:paddingEnd="3.5dp" />
+
+            <ImageView
+                android:id="@+id/menu_badge"
+                style="@style/UpdateMenuBadge"
+                android:src="@drawable/badge_update"
+                android:layout_marginEnd="8.5dp"
+                android:contentDescription="@null" />
+
+        </FrameLayout>
     </LinearLayout>
 </org.chromium.chrome.browser.toolbar.ToolbarTablet>