Add update menu item and app menu icon badge

chrome/android/java/res/layout/location_bar.xml

Index: chrome/android/java/res/layout/location_bar.xml
diff --git a/chrome/android/java/res/layout/location_bar.xml b/chrome/android/java/res/layout/location_bar.xml
index 073253f97b6b8a1876dbd3ca1882bb8a40e94659..319395de1a98e279716ba099bdc4e9e22110345c 100644
--- a/chrome/android/java/res/layout/location_bar.xml
+++ b/chrome/android/java/res/layout/location_bar.xml
@@ -13,17 +13,20 @@
         android:src="@drawable/ic_omnibox_incognito_badge"
         android:contentDescription="@null"
         android:visibility="gone" />
+
     <FrameLayout android:id="@+id/location_bar_icon"
         android:layout_width="@dimen/location_bar_icon_width"
         android:layout_height="match_parent"
-        android:visibility="gone">
+        android:visibility="gone" >
+
         <ImageView android:id="@+id/navigation_button"
             style="@style/LocationBarButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:scaleType="center"
-            android:contentDescription="@string/accessibility_toolbar_btn_site_info"/>
+            android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
+
         <ImageButton android:id="@+id/security_button"
             style="@style/LocationBarButton"
             android:layout_height="match_parent"
@@ -33,7 +36,9 @@
             android:alpha="0"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
+
     </FrameLayout>
+
     <include
         android:id="@+id/url_container"
         android:layout_width="match_parent"
@@ -43,21 +48,37 @@
         android:layout_marginStart="@dimen/location_bar_icon_width"
         android:layout_gravity="center_vertical"
         android:nextFocusForward="@+id/tab_switcher_button"
-        layout="@layout/url_container"
-        />
+        layout="@layout/url_container" />
+
     <FrameLayout android:id="@+id/url_action_container"
         android:layout_width="@dimen/location_bar_icon_width"
         android:layout_height="@dimen/toolbar_height_no_shadow"
         android:layout_gravity="end|center_vertical"
-        android:visibility="gone">
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/document_menu_button"
-            style="@style/LocationBarButton"
-            android:layout_height="match_parent"
-            android:layout_width="match_parent"
-            android:layoutDirection="locale"
-            android:src="@drawable/btn_menu"
-            android:contentDescription="@string/accessibility_toolbar_btn_menu" />
+        android:visibility="gone" >
+
+        <FrameLayout
+            android:id="@+id/document_menu_button_wrapper"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layoutDirection="locale" >
+
+            <org.chromium.chrome.browser.widget.TintedImageButton
+                android:id="@+id/document_menu_button"
+                style="@style/LocationBarButton"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:src="@drawable/btn_menu"
+                android:contentDescription="@string/accessibility_toolbar_btn_menu" />
+
+            <ImageView
+                android:id="@+id/document_menu_badge"
+                style="@style/UpdateMenuBadge"
+                android:src="@drawable/badge_update"
+                android:layout_marginEnd="3.5dp"
+                android:contentDescription="@null" />
+
+        </FrameLayout>
+
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/delete_button"
             style="@style/LocationBarButton"
@@ -67,6 +88,7 @@
             android:src="@drawable/btn_delete_url"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_delete_url" />
+
         <org.chromium.chrome.browser.widget.TintedImageButton
             android:id="@+id/mic_button"
             style="@style/LocationBarButton"
@@ -76,5 +98,6 @@
             android:src="@drawable/btn_mic"
             android:visibility="invisible"
             android:contentDescription="@string/accessibility_toolbar_btn_mic" />
+
     </FrameLayout>
 </merge>