| Index: chrome/browser/ui/tabs/tab_menu_model.cc
|
| ===================================================================
|
| --- chrome/browser/ui/tabs/tab_menu_model.cc (revision 84869)
|
| +++ chrome/browser/ui/tabs/tab_menu_model.cc (working copy)
|
| @@ -32,6 +32,16 @@
|
| #endif
|
| }
|
|
|
| +bool TabMenuModel::IsCompactNavigationModeEnabled() {
|
| +#if defined(TOOLKIT_VIEWS)
|
| + return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableCompactNavigation);
|
| +#else
|
| + return false;
|
| +#endif
|
| +}
|
| +
|
| +
|
| void TabMenuModel::Build(bool is_pinned) {
|
| AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB);
|
| AddSeparator();
|
| @@ -52,10 +62,16 @@
|
| AddItemWithStringId(TabStripModel::CommandRestoreTab, IDS_RESTORE_TAB);
|
| AddItemWithStringId(TabStripModel::CommandBookmarkAllTabs,
|
| IDS_TAB_CXMENU_BOOKMARK_ALL_TABS);
|
| - if (AreVerticalTabsEnabled()) {
|
| + if (AreVerticalTabsEnabled() || IsCompactNavigationModeEnabled()) {
|
| AddSeparator();
|
| - AddCheckItemWithStringId(TabStripModel::CommandUseVerticalTabs,
|
| - IDS_TAB_CXMENU_USE_VERTICAL_TABS);
|
| + if (AreVerticalTabsEnabled()) {
|
| + AddCheckItemWithStringId(TabStripModel::CommandUseVerticalTabs,
|
| + IDS_TAB_CXMENU_USE_VERTICAL_TABS);
|
| + }
|
| + if (IsCompactNavigationModeEnabled()) {
|
| + AddCheckItemWithStringId(TabStripModel::CommandUseCompactNavigationBar,
|
| + IDS_TAB_CXMENU_USE_COMPACT_NAVIGATION_BAR);
|
| + }
|
| }
|
| }
|
|
|
| @@ -94,10 +110,16 @@
|
| AddItemWithStringId(TabStripModel::CommandRestoreTab, IDS_RESTORE_TAB);
|
| AddItemWithStringId(TabStripModel::CommandBookmarkAllTabs,
|
| IDS_TAB_CXMENU_BOOKMARK_ALL_TABS);
|
| - if (AreVerticalTabsEnabled()) {
|
| + if (AreVerticalTabsEnabled() || IsCompactNavigationModeEnabled()) {
|
| AddSeparator();
|
| - AddCheckItemWithStringId(TabStripModel::CommandUseVerticalTabs,
|
| - IDS_TAB_CXMENU_USE_VERTICAL_TABS);
|
| + if (AreVerticalTabsEnabled()) {
|
| + AddCheckItemWithStringId(TabStripModel::CommandUseVerticalTabs,
|
| + IDS_TAB_CXMENU_USE_VERTICAL_TABS);
|
| + }
|
| + if (IsCompactNavigationModeEnabled()) {
|
| + AddCheckItemWithStringId(TabStripModel::CommandUseCompactNavigationBar,
|
| + IDS_TAB_CXMENU_USE_COMPACT_NAVIGATION_BAR);
|
| + }
|
| }
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableTabGroupsContextMenu)) {
|
|
|