diff options
| author | stevenjb <stevenjb@chromium.org> | 2014-08-28 16:25:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 23:27:05 +0000 |
| commit | 9dc76456d19bc4c1ada2c28cf0cc74911cc74581 (patch) | |
| tree | c3614fa76538a30e476fda1c2f2999325ba8f910 | |
| parent | ee53aabbe77593434b57544f54c3f771f37657e7 (diff) | |
| download | chromium_src-9dc76456d19bc4c1ada2c28cf0cc74911cc74581.zip chromium_src-9dc76456d19bc4c1ada2c28cf0cc74911cc74581.tar.gz chromium_src-9dc76456d19bc4c1ada2c28cf0cc74911cc74581.tar.bz2 | |
Move 'Extensions' to the main menu for settings-in-a-window
BUG=407162
Review URL: https://codereview.chromium.org/511923002
Cr-Commit-Position: refs/heads/master@{#292492}
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 0574736..8aecdd0 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -249,7 +249,9 @@ void ToolsMenuModel::Build(Browser* browser) { AddSeparator(ui::NORMAL_SEPARATOR); } - AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); + // If settings-in-a-window is enabled the Extensions item is at the top level. + if (!::switches::SettingsWindowEnabled()) + AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); if (chrome::CanOpenTaskManager()) AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); @@ -595,6 +597,9 @@ void WrenchMenuModel::Build() { AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS); + // If settings-in-a-window is enabled the Extensions item is at the top level. + if (::switches::SettingsWindowEnabled()) + AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); AddSeparator(ui::NORMAL_SEPARATOR); #if !defined(OS_CHROMEOS) |