Handle more browser commands in ash.

chrome/browser/ui/views/accelerator_table.cc

Index: chrome/browser/ui/views/accelerator_table.cc
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 0b85d27501e1d2b89a11e712f9976772c203f42c..5cfde2735625dcaa8d32c1a75cc8bb40582ff67b 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -27,11 +27,6 @@ const AcceleratorMapping kAcceleratorMap[] = {
 #if !defined(OS_CHROMEOS)
   { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_CLEAR_BROWSING_DATA },
-#else
-  { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-    IDC_CLEAR_BROWSING_DATA },
-#endif
-#if !defined(OS_CHROMEOS)
   { ui::VKEY_F4, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB },
 #endif
   { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_TAB },
@@ -39,7 +34,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
 #if !defined(OS_CHROMEOS)
   { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW },
 #endif
-#if !defined(USE_AURA)
+#if !defined(USE_ASH)
   { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT },
 #endif
   { ui::VKEY_F, ui::EF_CONTROL_DOWN, IDC_FIND },
@@ -82,9 +77,6 @@ const AcceleratorMapping kAcceleratorMap[] = {
 #endif
 #if !defined(OS_CHROMEOS)
   { ui::VKEY_F1, ui::EF_NONE, IDC_HELP_PAGE },
-#else
-  { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE },
-  { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_HELP_PAGE },
 #endif
   { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_DEV_TOOLS },
 #if defined(OS_CHROMEOS)
@@ -98,9 +90,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
 #if !defined(USE_ASH)
   { ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_NEW_INCOGNITO_WINDOW },
-#endif
   { ui::VKEY_T, ui::EF_CONTROL_DOWN, IDC_NEW_TAB },
-#if !defined(USE_ASH)
   { ui::VKEY_N, ui::EF_CONTROL_DOWN, IDC_NEW_WINDOW },
 #endif
   { ui::VKEY_O, ui::EF_CONTROL_DOWN, IDC_OPEN_FILE },
@@ -118,8 +108,10 @@ const AcceleratorMapping kAcceleratorMap[] = {
   { ui::VKEY_F3, ui::EF_CONTROL_DOWN, IDC_RELOAD_IGNORING_CACHE },
   { ui::VKEY_F3, ui::EF_SHIFT_DOWN, IDC_RELOAD_IGNORING_CACHE },
 #endif
+#if !defined(USE_ASH)
   { ui::VKEY_HOME, ui::EF_ALT_DOWN, IDC_HOME },
   { ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_RESTORE_TAB },
+#endif
   { ui::VKEY_S, ui::EF_CONTROL_DOWN, IDC_SAVE_PAGE },
   { ui::VKEY_9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
   { ui::VKEY_NUMPAD9, ui::EF_CONTROL_DOWN, IDC_SELECT_LAST_TAB },
@@ -146,10 +138,12 @@ const AcceleratorMapping kAcceleratorMap[] = {
   { ui::VKEY_NUMPAD8, ui::EF_CONTROL_DOWN, IDC_SELECT_TAB_7 },
   { ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_SHOW_BOOKMARK_BAR },
+#if !defined(USE_ASH)
   { ui::VKEY_O, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_SHOW_BOOKMARK_MANAGER },
   { ui::VKEY_J, ui::EF_CONTROL_DOWN, IDC_SHOW_DOWNLOADS },
   { ui::VKEY_H, ui::EF_CONTROL_DOWN, IDC_SHOW_HISTORY },
+#endif
   { ui::VKEY_F, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU},
   { ui::VKEY_E, ui::EF_ALT_DOWN, IDC_SHOW_APP_MENU},
 #if !defined(OS_CHROMEOS)