Move remaining resources from java_staging/res to java/res.

This moves the all the remaining resources in java_staging/res to
java/res. This includes layouts, animations, menus, transitions, xml,
and values.

A later CL will delete the empty res folder (which now contains just an
OWNERS file) and delete the build targets. Before then, all the Java
files need to be updated to use org.chromium.chrome.R instead of
com.google.android.apps.chrome.R.

Generated using:

  cd java_staging
  for src in $(find res -type f); do
    dst="../java/$src"
    mkdir -p $(dirname $dst)
    mv $src $dst
  done

BUG=497470

Review URL: https://codereview.chromium.org/1178323005

Cr-Commit-Position: refs/heads/master@{#334775}

88 files changed, 3 insertions, 1 deletions

diff --git a/build/android/lint/suppressions.xml b/build/android/lint/suppressions.xml
index 6921695..24b0846 100644
--- a/build/android/lint/suppressions.xml
+++ b/build/android/lint/suppressions.xml
@@ -51,6 +51,7 @@ Still reading?
     <ignore path="chrome/android/java/res/drawable-xxxhdpi"/>
     <ignore path="ui/android/java/res/drawable-xxhdpi"/>
     <ignore path="ui/android/java/res/drawable-xxxhdpi"/>
+    <ignore regexp=".*: reader_mode_bar_background.9.png, tabs_moved_htc.png, tabs_moved_nexus.png, tabs_moved_samsung.png$"/>
   </issue>
   <!-- It is OK for content_shell_apk and chrome_shell_apk to have missing assets. -->
   <issue id="IconLocation">
diff --git a/chrome/android/java_staging/res/anim/snackbar_in.xml b/chrome/android/java/res/anim/snackbar_in.xml
index 3cdb479..3cdb479 100644
--- a/chrome/android/java_staging/res/anim/snackbar_in.xml
+++ b/chrome/android/java/res/anim/snackbar_in.xml
diff --git a/chrome/android/java_staging/res/anim/snackbar_out.xml b/chrome/android/java/res/anim/snackbar_out.xml
index 188d555..188d555 100644
--- a/chrome/android/java_staging/res/anim/snackbar_out.xml
+++ b/chrome/android/java/res/anim/snackbar_out.xml
diff --git a/chrome/android/java_staging/res/color/eb_drawer_text_color.xml b/chrome/android/java/res/color/eb_drawer_text_color.xml
index 982e3cb..982e3cb 100644
--- a/chrome/android/java_staging/res/color/eb_drawer_text_color.xml
+++ b/chrome/android/java/res/color/eb_drawer_text_color.xml
diff --git a/chrome/android/java_staging/res/color/snack_bar_button_color.xml b/chrome/android/java/res/color/snack_bar_button_color.xml
index 9238a03..9238a03 100644
--- a/chrome/android/java_staging/res/color/snack_bar_button_color.xml
+++ b/chrome/android/java/res/color/snack_bar_button_color.xml
diff --git a/chrome/android/java_staging/res/drawable-mdpi/reader_mode_bar_background.9.png b/chrome/android/java/res/drawable-mdpi/reader_mode_bar_background.9.png
index f5ae68f..f5ae68f 100644
--- a/chrome/android/java_staging/res/drawable-mdpi/reader_mode_bar_background.9.png
+++ b/chrome/android/java/res/drawable-mdpi/reader_mode_bar_background.9.png
diff --git a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_htc.png b/chrome/android/java/res/drawable-mdpi/tabs_moved_htc.png
index 9962343..9962343 100644
--- a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_htc.png
+++ b/chrome/android/java/res/drawable-mdpi/tabs_moved_htc.png
diff --git a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_nexus.png b/chrome/android/java/res/drawable-mdpi/tabs_moved_nexus.png
index 8130d97..8130d97 100644
--- a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_nexus.png
+++ b/chrome/android/java/res/drawable-mdpi/tabs_moved_nexus.png
diff --git a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_samsung.png b/chrome/android/java/res/drawable-mdpi/tabs_moved_samsung.png
index f1efdeb..f1efdeb 100644
--- a/chrome/android/java_staging/res/drawable-mdpi/tabs_moved_samsung.png
+++ b/chrome/android/java/res/drawable-mdpi/tabs_moved_samsung.png
diff --git a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_htc.png b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_htc.png
index 0c15c34..0c15c34 100644
--- a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_htc.png
+++ b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_htc.png
diff --git a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_nexus.png b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_nexus.png
index bd18fa7..bd18fa7 100644
--- a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_nexus.png
+++ b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_nexus.png
diff --git a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_samsung.png b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_samsung.png
index 90e16ee..90e16ee 100644
--- a/chrome/android/java_staging/res/drawable-xxhdpi/tabs_moved_samsung.png
+++ b/chrome/android/java/res/drawable-xxhdpi/tabs_moved_samsung.png
diff --git a/chrome/android/java_staging/res/layout-sw600dp/empty_background_view.xml b/chrome/android/java/res/layout-sw600dp/empty_background_view.xml
index b2315d6..b2315d6 100644
--- a/chrome/android/java_staging/res/layout-sw600dp/empty_background_view.xml
+++ b/chrome/android/java/res/layout-sw600dp/empty_background_view.xml
diff --git a/chrome/android/java_staging/res/layout-sw600dp/find_toolbar.xml b/chrome/android/java/res/layout-sw600dp/find_toolbar.xml
index 9c3f944..9c3f944 100644
--- a/chrome/android/java_staging/res/layout-sw600dp/find_toolbar.xml
+++ b/chrome/android/java/res/layout-sw600dp/find_toolbar.xml
diff --git a/chrome/android/java_staging/res/layout-sw600dp/location_bar.xml b/chrome/android/java/res/layout-sw600dp/location_bar.xml
index 45ba339..45ba339 100644
--- a/chrome/android/java_staging/res/layout-sw600dp/location_bar.xml
+++ b/chrome/android/java/res/layout-sw600dp/location_bar.xml
diff --git a/chrome/android/java_staging/res/layout-sw600dp/toolbar.xml b/chrome/android/java/res/layout-sw600dp/toolbar.xml
index a60efe7..a60efe7 100644
--- a/chrome/android/java_staging/res/layout-sw600dp/toolbar.xml
+++ b/chrome/android/java/res/layout-sw600dp/toolbar.xml
diff --git a/chrome/android/java_staging/res/layout-sw720dp/eb_main.xml b/chrome/android/java/res/layout-sw720dp/eb_main.xml
index aa0db66..aa0db66 100644
--- a/chrome/android/java_staging/res/layout-sw720dp/eb_main.xml
+++ b/chrome/android/java/res/layout-sw720dp/eb_main.xml
diff --git a/chrome/android/java_staging/res/layout/add_bookmark.xml b/chrome/android/java/res/layout/add_bookmark.xml
index 36e93bb..36e93bb 100644
--- a/chrome/android/java_staging/res/layout/add_bookmark.xml
+++ b/chrome/android/java/res/layout/add_bookmark.xml
diff --git a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget.xml b/chrome/android/java/res/layout/bookmark_thumbnail_widget.xml
index 2f573f0..2f573f0 100644
--- a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget.xml
+++ b/chrome/android/java/res/layout/bookmark_thumbnail_widget.xml
diff --git a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget_item.xml b/chrome/android/java/res/layout/bookmark_thumbnail_widget_item.xml
index 5cb1901..5cb1901 100644
--- a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget_item.xml
+++ b/chrome/android/java/res/layout/bookmark_thumbnail_widget_item.xml
diff --git a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget_item_folder.xml b/chrome/android/java/res/layout/bookmark_thumbnail_widget_item_folder.xml
index 3896995..3896995 100644
--- a/chrome/android/java_staging/res/layout/bookmark_thumbnail_widget_item_folder.xml
+++ b/chrome/android/java/res/layout/bookmark_thumbnail_widget_item_folder.xml
diff --git a/chrome/android/java_staging/res/layout/bookmarks_page.xml b/chrome/android/java/res/layout/bookmarks_page.xml
index 426bc97..426bc97 100644
--- a/chrome/android/java_staging/res/layout/bookmarks_page.xml
+++ b/chrome/android/java/res/layout/bookmarks_page.xml
diff --git a/chrome/android/java_staging/res/layout/control_container.xml b/chrome/android/java/res/layout/control_container.xml
index a771aff..a771aff 100644
--- a/chrome/android/java_staging/res/layout/control_container.xml
+++ b/chrome/android/java/res/layout/control_container.xml
diff --git a/chrome/android/java_staging/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml
index 87b45c7..87b45c7 100644
--- a/chrome/android/java_staging/res/layout/custom_tabs_control_container.xml
+++ b/chrome/android/java/res/layout/custom_tabs_control_container.xml
diff --git a/chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
index 5f117be..5f117be 100644
--- a/chrome/android/java_staging/res/layout/custom_tabs_toolbar.xml
+++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/dialog_with_titlebar.xml b/chrome/android/java/res/layout/dialog_with_titlebar.xml
index 3a4dd68..3a4dd68 100644
--- a/chrome/android/java_staging/res/layout/dialog_with_titlebar.xml
+++ b/chrome/android/java/res/layout/dialog_with_titlebar.xml
diff --git a/chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml b/chrome/android/java/res/layout/eb_add_edit_folder_activity.xml
index c4ff36e..c4ff36e 100644
--- a/chrome/android/java_staging/res/layout/eb_add_edit_folder_activity.xml
+++ b/chrome/android/java/res/layout/eb_add_edit_folder_activity.xml
diff --git a/chrome/android/java_staging/res/layout/eb_detail.xml b/chrome/android/java/res/layout/eb_detail.xml
index 70c2b13..70c2b13 100644
--- a/chrome/android/java_staging/res/layout/eb_detail.xml
+++ b/chrome/android/java/res/layout/eb_detail.xml
diff --git a/chrome/android/java_staging/res/layout/eb_drawer_item.xml b/chrome/android/java/res/layout/eb_drawer_item.xml
index ad3ed4a..ad3ed4a 100644
--- a/chrome/android/java_staging/res/layout/eb_drawer_item.xml
+++ b/chrome/android/java/res/layout/eb_drawer_item.xml
diff --git a/chrome/android/java_staging/res/layout/eb_drawer_title.xml b/chrome/android/java/res/layout/eb_drawer_title.xml
index d8918f3..d8918f3 100644
--- a/chrome/android/java_staging/res/layout/eb_drawer_title.xml
+++ b/chrome/android/java/res/layout/eb_drawer_title.xml
diff --git a/chrome/android/java_staging/res/layout/eb_folder_select_activity.xml b/chrome/android/java/res/layout/eb_folder_select_activity.xml
index 8da35bb..8da35bb 100644
--- a/chrome/android/java_staging/res/layout/eb_folder_select_activity.xml
+++ b/chrome/android/java/res/layout/eb_folder_select_activity.xml
diff --git a/chrome/android/java_staging/res/layout/eb_folder_select_item.xml b/chrome/android/java/res/layout/eb_folder_select_item.xml
index a10610d..a10610d 100644
--- a/chrome/android/java_staging/res/layout/eb_folder_select_item.xml
+++ b/chrome/android/java/res/layout/eb_folder_select_item.xml
diff --git a/chrome/android/java_staging/res/layout/eb_grid_folder.xml b/chrome/android/java/res/layout/eb_grid_folder.xml
index c769b88..c769b88 100644
--- a/chrome/android/java_staging/res/layout/eb_grid_folder.xml
+++ b/chrome/android/java/res/layout/eb_grid_folder.xml
diff --git a/chrome/android/java_staging/res/layout/eb_grid_item.xml b/chrome/android/java/res/layout/eb_grid_item.xml
index b7290f5..b7290f5 100644
--- a/chrome/android/java_staging/res/layout/eb_grid_item.xml
+++ b/chrome/android/java/res/layout/eb_grid_item.xml
diff --git a/chrome/android/java_staging/res/layout/eb_list_divider.xml b/chrome/android/java/res/layout/eb_list_divider.xml
index 9c23fe4..9c23fe4 100644
--- a/chrome/android/java_staging/res/layout/eb_list_divider.xml
+++ b/chrome/android/java/res/layout/eb_list_divider.xml
diff --git a/chrome/android/java_staging/res/layout/eb_list_folder.xml b/chrome/android/java/res/layout/eb_list_folder.xml
index 343fe52a..343fe52a 100644
--- a/chrome/android/java_staging/res/layout/eb_list_folder.xml
+++ b/chrome/android/java/res/layout/eb_list_folder.xml
diff --git a/chrome/android/java_staging/res/layout/eb_list_item.xml b/chrome/android/java/res/layout/eb_list_item.xml
index fc98436..fc98436 100644
--- a/chrome/android/java_staging/res/layout/eb_list_item.xml
+++ b/chrome/android/java/res/layout/eb_list_item.xml
diff --git a/chrome/android/java_staging/res/layout/eb_main.xml b/chrome/android/java/res/layout/eb_main.xml
index d120b8f..d120b8f 100644
--- a/chrome/android/java_staging/res/layout/eb_main.xml
+++ b/chrome/android/java/res/layout/eb_main.xml
diff --git a/chrome/android/java_staging/res/layout/eb_main_content.xml b/chrome/android/java/res/layout/eb_main_content.xml
index 5b05c62..5b05c62 100644
--- a/chrome/android/java_staging/res/layout/eb_main_content.xml
+++ b/chrome/android/java/res/layout/eb_main_content.xml
diff --git a/chrome/android/java_staging/res/layout/eb_popup_item.xml b/chrome/android/java/res/layout/eb_popup_item.xml
index 3c918d4..3c918d4 100644
--- a/chrome/android/java_staging/res/layout/eb_popup_item.xml
+++ b/chrome/android/java/res/layout/eb_popup_item.xml
diff --git a/chrome/android/java_staging/res/layout/eb_promo_header.xml b/chrome/android/java/res/layout/eb_promo_header.xml
index ba2120d..ba2120d 100644
--- a/chrome/android/java_staging/res/layout/eb_promo_header.xml
+++ b/chrome/android/java/res/layout/eb_promo_header.xml
diff --git a/chrome/android/java_staging/res/layout/find_in_page.xml b/chrome/android/java/res/layout/find_in_page.xml
index 35c8e42..35c8e42 100644
--- a/chrome/android/java_staging/res/layout/find_in_page.xml
+++ b/chrome/android/java/res/layout/find_in_page.xml
diff --git a/chrome/android/java_staging/res/layout/find_toolbar.xml b/chrome/android/java/res/layout/find_toolbar.xml
index dc648a7..dc648a7 100644
--- a/chrome/android/java_staging/res/layout/find_toolbar.xml
+++ b/chrome/android/java/res/layout/find_toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/icon_most_visited_item.xml b/chrome/android/java/res/layout/icon_most_visited_item.xml
index 1d55377..1d55377 100644
--- a/chrome/android/java_staging/res/layout/icon_most_visited_item.xml
+++ b/chrome/android/java/res/layout/icon_most_visited_item.xml
diff --git a/chrome/android/java_staging/res/layout/icon_most_visited_layout.xml b/chrome/android/java/res/layout/icon_most_visited_layout.xml
index 621d7cd..621d7cd 100644
--- a/chrome/android/java_staging/res/layout/icon_most_visited_layout.xml
+++ b/chrome/android/java/res/layout/icon_most_visited_layout.xml
diff --git a/chrome/android/java_staging/res/layout/location_bar.xml b/chrome/android/java/res/layout/location_bar.xml
index cd410c3..cd410c3 100644
--- a/chrome/android/java_staging/res/layout/location_bar.xml
+++ b/chrome/android/java/res/layout/location_bar.xml
diff --git a/chrome/android/java_staging/res/layout/main.xml b/chrome/android/java/res/layout/main.xml
index 5d69370..5d69370 100644
--- a/chrome/android/java_staging/res/layout/main.xml
+++ b/chrome/android/java/res/layout/main.xml
diff --git a/chrome/android/java_staging/res/layout/most_visited_item.xml b/chrome/android/java/res/layout/most_visited_item.xml
index 8df8003..8df8003 100644
--- a/chrome/android/java_staging/res/layout/most_visited_item.xml
+++ b/chrome/android/java/res/layout/most_visited_item.xml
diff --git a/chrome/android/java_staging/res/layout/most_visited_layout.xml b/chrome/android/java/res/layout/most_visited_layout.xml
index 647245a..647245a 100644
--- a/chrome/android/java_staging/res/layout/most_visited_layout.xml
+++ b/chrome/android/java/res/layout/most_visited_layout.xml
diff --git a/chrome/android/java_staging/res/layout/most_visited_placeholder.xml b/chrome/android/java/res/layout/most_visited_placeholder.xml
index 23e4d40..23e4d40 100644
--- a/chrome/android/java_staging/res/layout/most_visited_placeholder.xml
+++ b/chrome/android/java/res/layout/most_visited_placeholder.xml
diff --git a/chrome/android/java_staging/res/layout/new_tab_page.xml b/chrome/android/java/res/layout/new_tab_page.xml
index 7ffd3227..7ffd3227 100644
--- a/chrome/android/java_staging/res/layout/new_tab_page.xml
+++ b/chrome/android/java/res/layout/new_tab_page.xml
diff --git a/chrome/android/java_staging/res/layout/new_tab_page_incognito.xml b/chrome/android/java/res/layout/new_tab_page_incognito.xml
index 17a0eae..17a0eae 100644
--- a/chrome/android/java_staging/res/layout/new_tab_page_incognito.xml
+++ b/chrome/android/java/res/layout/new_tab_page_incognito.xml
diff --git a/chrome/android/java_staging/res/layout/omnibox_results_container.xml b/chrome/android/java/res/layout/omnibox_results_container.xml
index 1678f62..1678f62 100644
--- a/chrome/android/java_staging/res/layout/omnibox_results_container.xml
+++ b/chrome/android/java/res/layout/omnibox_results_container.xml
diff --git a/chrome/android/java_staging/res/layout/opt_out_promo.xml b/chrome/android/java/res/layout/opt_out_promo.xml
index 4ae36f3..4ae36f3 100644
--- a/chrome/android/java_staging/res/layout/opt_out_promo.xml
+++ b/chrome/android/java/res/layout/opt_out_promo.xml
diff --git a/chrome/android/java_staging/res/layout/prerender_test_main.xml b/chrome/android/java/res/layout/prerender_test_main.xml
index 9ece1a8..9ece1a8 100644
--- a/chrome/android/java_staging/res/layout/prerender_test_main.xml
+++ b/chrome/android/java/res/layout/prerender_test_main.xml
diff --git a/chrome/android/java_staging/res/layout/reader_mode_control.xml b/chrome/android/java/res/layout/reader_mode_control.xml
index c382f5a..c382f5a 100644
--- a/chrome/android/java_staging/res/layout/reader_mode_control.xml
+++ b/chrome/android/java/res/layout/reader_mode_control.xml
diff --git a/chrome/android/java_staging/res/layout/reader_mode_view.xml b/chrome/android/java/res/layout/reader_mode_view.xml
index 3aa5288..3aa5288 100644
--- a/chrome/android/java_staging/res/layout/reader_mode_view.xml
+++ b/chrome/android/java/res/layout/reader_mode_view.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_group_item.xml b/chrome/android/java/res/layout/recent_tabs_group_item.xml
index 0a024af..0a024af 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_group_item.xml
+++ b/chrome/android/java/res/layout/recent_tabs_group_item.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_group_separator_invisible.xml b/chrome/android/java/res/layout/recent_tabs_group_separator_invisible.xml
index 5b39c37..5b39c37 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_group_separator_invisible.xml
+++ b/chrome/android/java/res/layout/recent_tabs_group_separator_invisible.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_group_separator_visible.xml b/chrome/android/java/res/layout/recent_tabs_group_separator_visible.xml
index ed51ec5..ed51ec5 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_group_separator_visible.xml
+++ b/chrome/android/java/res/layout/recent_tabs_group_separator_visible.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_list_item.xml b/chrome/android/java/res/layout/recent_tabs_list_item.xml
index 2d6bd91..2d6bd91 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_list_item.xml
+++ b/chrome/android/java/res/layout/recent_tabs_list_item.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_page.xml b/chrome/android/java/res/layout/recent_tabs_page.xml
index 77df36f..77df36f 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_page.xml
+++ b/chrome/android/java/res/layout/recent_tabs_page.xml
diff --git a/chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml b/chrome/android/java/res/layout/recent_tabs_sync_promo.xml
index a732516..a732516 100644
--- a/chrome/android/java_staging/res/layout/recent_tabs_sync_promo.xml
+++ b/chrome/android/java/res/layout/recent_tabs_sync_promo.xml
diff --git a/chrome/android/java_staging/res/layout/select_bookmark_folder.xml b/chrome/android/java/res/layout/select_bookmark_folder.xml
index 69d353e..69d353e 100644
--- a/chrome/android/java_staging/res/layout/select_bookmark_folder.xml
+++ b/chrome/android/java/res/layout/select_bookmark_folder.xml
diff --git a/chrome/android/java_staging/res/layout/select_bookmark_folder_item.xml b/chrome/android/java/res/layout/select_bookmark_folder_item.xml
index 6524714..6524714 100644
--- a/chrome/android/java_staging/res/layout/select_bookmark_folder_item.xml
+++ b/chrome/android/java/res/layout/select_bookmark_folder_item.xml
diff --git a/chrome/android/java_staging/res/layout/single_line_edit_dialog.xml b/chrome/android/java/res/layout/single_line_edit_dialog.xml
index 60b5a63..60b5a63 100644
--- a/chrome/android/java_staging/res/layout/single_line_edit_dialog.xml
+++ b/chrome/android/java/res/layout/single_line_edit_dialog.xml
diff --git a/chrome/android/java_staging/res/layout/snack_bar.xml b/chrome/android/java/res/layout/snack_bar.xml
index 297917c..297917c 100644
--- a/chrome/android/java_staging/res/layout/snack_bar.xml
+++ b/chrome/android/java/res/layout/snack_bar.xml
diff --git a/chrome/android/java_staging/res/layout/toolbar.xml b/chrome/android/java/res/layout/toolbar.xml
index 04b041f..04b041f 100644
--- a/chrome/android/java_staging/res/layout/toolbar.xml
+++ b/chrome/android/java/res/layout/toolbar.xml
diff --git a/chrome/android/java_staging/res/layout/url_container.xml b/chrome/android/java/res/layout/url_container.xml
index eed7b57..eed7b57 100644
--- a/chrome/android/java_staging/res/layout/url_container.xml
+++ b/chrome/android/java/res/layout/url_container.xml
diff --git a/chrome/android/java_staging/res/layout/webapp_control_container.xml b/chrome/android/java/res/layout/webapp_control_container.xml
index 1d434a99..1d434a99 100644
--- a/chrome/android/java_staging/res/layout/webapp_control_container.xml
+++ b/chrome/android/java/res/layout/webapp_control_container.xml
diff --git a/chrome/android/java_staging/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
index 7ac980b..7ac980b 100644
--- a/chrome/android/java_staging/res/menu/custom_tabs_menu.xml
+++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
diff --git a/chrome/android/java_staging/res/menu/eb_action_bar_menu.xml b/chrome/android/java/res/menu/eb_action_bar_menu.xml
index 14a86ed..14a86ed 100644
--- a/chrome/android/java_staging/res/menu/eb_action_bar_menu.xml
+++ b/chrome/android/java/res/menu/eb_action_bar_menu.xml
diff --git a/chrome/android/java_staging/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
index 7f7b242..7f7b242 100644
--- a/chrome/android/java_staging/res/menu/main_menu.xml
+++ b/chrome/android/java/res/menu/main_menu.xml
diff --git a/chrome/android/java_staging/res/menu/textselectionmenu.xml b/chrome/android/java/res/menu/textselectionmenu.xml
index 868a6ce..868a6ce 100644
--- a/chrome/android/java_staging/res/menu/textselectionmenu.xml
+++ b/chrome/android/java/res/menu/textselectionmenu.xml
diff --git a/chrome/android/java_staging/res/transition/fade.xml b/chrome/android/java/res/transition/fade.xml
index e2f3e74..e2f3e74 100644
--- a/chrome/android/java_staging/res/transition/fade.xml
+++ b/chrome/android/java/res/transition/fade.xml
diff --git a/chrome/android/java_staging/res/transition/move_image.xml b/chrome/android/java/res/transition/move_image.xml
index 89223b5..89223b5 100644
--- a/chrome/android/java_staging/res/transition/move_image.xml
+++ b/chrome/android/java/res/transition/move_image.xml
diff --git a/chrome/android/java_staging/res/values-sw600dp/values_staging.xml b/chrome/android/java/res/values-sw600dp/values_staging.xml
index 5cfc5cd..5cfc5cd 100644
--- a/chrome/android/java_staging/res/values-sw600dp/values_staging.xml
+++ b/chrome/android/java/res/values-sw600dp/values_staging.xml
diff --git a/chrome/android/java_staging/res/values-v17/styles_staging.xml b/chrome/android/java/res/values-v17/styles_staging.xml
index ad80324..ad80324 100644
--- a/chrome/android/java_staging/res/values-v17/styles_staging.xml
+++ b/chrome/android/java/res/values-v17/styles_staging.xml
diff --git a/chrome/android/java_staging/res/values-v21/styles_staging.xml b/chrome/android/java/res/values-v21/styles_staging.xml
index 92a1279..92a1279 100644
--- a/chrome/android/java_staging/res/values-v21/styles_staging.xml
+++ b/chrome/android/java/res/values-v21/styles_staging.xml
diff --git a/chrome/android/java_staging/res/values/attrs_staging.xml b/chrome/android/java/res/values/attrs_staging.xml
index ebb8033..ebb8033 100644
--- a/chrome/android/java_staging/res/values/attrs_staging.xml
+++ b/chrome/android/java/res/values/attrs_staging.xml
diff --git a/chrome/android/java_staging/res/values/values_staging.xml b/chrome/android/java/res/values/values_staging.xml
index 4cde02e..4cde02e 100644
--- a/chrome/android/java_staging/res/values/values_staging.xml
+++ b/chrome/android/java/res/values/values_staging.xml
diff --git a/chrome/android/java_staging/res/xml-sw600dp/bookmark_thumbnail_widget_info.xml b/chrome/android/java/res/xml-sw600dp/bookmark_thumbnail_widget_info.xml
index 8d98202..8d98202 100644
--- a/chrome/android/java_staging/res/xml-sw600dp/bookmark_thumbnail_widget_info.xml
+++ b/chrome/android/java/res/xml-sw600dp/bookmark_thumbnail_widget_info.xml
diff --git a/chrome/android/java_staging/res/xml/bookmark_thumbnail_widget_info.xml b/chrome/android/java/res/xml/bookmark_thumbnail_widget_info.xml
index b68d385..b68d385 100644
--- a/chrome/android/java_staging/res/xml/bookmark_thumbnail_widget_info.xml
+++ b/chrome/android/java/res/xml/bookmark_thumbnail_widget_info.xml
diff --git a/chrome/android/java_staging/res/xml/document_mode_preferences.xml b/chrome/android/java/res/xml/document_mode_preferences.xml
index 0c380e9..0c380e9 100644
--- a/chrome/android/java_staging/res/xml/document_mode_preferences.xml
+++ b/chrome/android/java/res/xml/document_mode_preferences.xml
diff --git a/chrome/android/java_staging/res/xml/file_paths.xml b/chrome/android/java/res/xml/file_paths.xml
index 2ef1b29..2ef1b29 100644
--- a/chrome/android/java_staging/res/xml/file_paths.xml
+++ b/chrome/android/java/res/xml/file_paths.xml
diff --git a/chrome/android/java_staging/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
index f2467c5..f2467c5 100644
--- a/chrome/android/java_staging/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
index 28fa149..6c12fb5 100644
--- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
+++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
@@ -189,7 +189,8 @@ public class ChromeShellActivity extends AppCompatActivity implements AppMenuPro
             mTabManager.setStartupUrl(startupUrl);
         }
         mToolbar = (ChromeShellToolbar) findViewById(R.id.toolbar);
-        mAppMenuHandler = sAppMenuHandlerFactory.getAppMenuHandler(this, this, R.menu.main_menu);
+        mAppMenuHandler = sAppMenuHandlerFactory.getAppMenuHandler(this, this,
+                R.menu.chrome_shell_main_menu);
         mToolbar.setMenuHandler(mAppMenuHandler);
 
         mDevToolsServer = new DevToolsServer("chrome_shell");
diff --git a/chrome/android/shell/res/menu/main_menu.xml b/chrome/android/shell/res/menu/chrome_shell_main_menu.xml
index 595fcc2..595fcc2 100644
--- a/chrome/android/shell/res/menu/main_menu.xml
+++ b/chrome/android/shell/res/menu/chrome_shell_main_menu.xml