diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:00:36 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 19:00:36 +0000 |
| commit | ae62cfa9a110544f435f6c542ebbdddd780ca686 (patch) | |
| tree | fe1c3b46bfd53b682c478ef43a1719d4d0044f86 /chrome/browser/tab_menu_model.cc | |
| parent | f37c44ad8b465a2c70e39caebe43ef805bb301d6 (diff) | |
| download | chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.zip chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.tar.gz chromium_src-ae62cfa9a110544f435f6c542ebbdddd780ca686.tar.bz2 | |
Revert 53062 - Makes the toolbar visible for apps again. Here's the set of patches I
reverted: 49016, 47119, 47177, 46930, 46775, and the UI changes for
45566. If you see anything missing, please let me know.
Also, there are some grd strings no longer necessary. I'll nuke those
separately.
BUG=49013
TEST=none
Review URL: http://codereview.chromium.org/2888020
TBR=sky@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_menu_model.cc')
| -rw-r--r-- | chrome/browser/tab_menu_model.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/tab_menu_model.cc index 6b8dc17..41667b2 100644 --- a/chrome/browser/tab_menu_model.cc +++ b/chrome/browser/tab_menu_model.cc @@ -10,9 +10,11 @@ #include "grit/generated_resources.h" TabMenuModel::TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, - bool is_pinned) + bool is_pinned, + bool allow_toolbar_toggle, + bool is_toolbar_visible) : menus::SimpleMenuModel(delegate) { - Build(is_pinned); + Build(is_pinned, allow_toolbar_toggle, is_toolbar_visible); } // static @@ -27,7 +29,8 @@ bool TabMenuModel::AreVerticalTabsEnabled() { #endif } -void TabMenuModel::Build(bool is_pinned) { +void TabMenuModel::Build(bool is_pinned, bool allow_toolbar_toggle, + bool is_toolbar_visible) { AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB); AddSeparator(); AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD); @@ -36,6 +39,12 @@ void TabMenuModel::Build(bool is_pinned) { AddItemWithStringId( TabStripModel::CommandTogglePinned, is_pinned ? IDS_TAB_CXMENU_UNPIN_TAB : IDS_TAB_CXMENU_PIN_TAB); + if (allow_toolbar_toggle) { + AddItemWithStringId( + TabStripModel::CommandToggleToolbar, + is_toolbar_visible ? IDS_TAB_CXMENU_HIDE_TOOLBAR : + IDS_TAB_CXMENU_SHOW_TOOLBAR); + } AddSeparator(); AddItemWithStringId(TabStripModel::CommandCloseTab, IDS_TAB_CXMENU_CLOSETAB); |