Move 'Extensions' to the main menu for settings-in-a-window

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 93ece73f9492e9d54c4d014565956e722f54eeb3..928e28259bcfc1b5f94164b1ab890709b561bece 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -250,7 +250,9 @@ void ToolsMenuModel::Build(Browser* browser) {
     AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
-  AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
+  // If settins-in-a-window is enabled, the Extensions item is at the top level.

[Evan Stade, 2014/08/28 18:13:51]

nit: spelling

[stevenjb, 2014/08/28 19:50:00]

Done.

+  if (!::switches::SettingsWindowEnabled())
+    AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
 
   if (chrome::CanOpenTaskManager())
     AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
@@ -613,6 +615,9 @@ void WrenchMenuModel::Build() {
 
   AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY);
   AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS);
+  // If settins-in-a-window is enabled, the Extensions item is at the top level.

[Evan Stade, 2014/08/28 18:13:51]

spelling again

[stevenjb, 2014/08/28 19:50:00]

Done.

+  if (::switches::SettingsWindowEnabled())
+    AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
   AddSeparator(ui::NORMAL_SEPARATOR);
 
 #if !defined(OS_CHROMEOS)