diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:33:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-21 17:33:03 +0000 |
| commit | 995e402e14f8dd8c48efc6a191e9b8764700d617 (patch) | |
| tree | d77b95716b36c439f9588c8041fd61e5aac6fc0c /chrome/browser/tab_menu_model.cc | |
| parent | 8f90bbcedd2241d361fc9cb8e93803343698500b (diff) | |
| download | chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.zip chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.gz chromium_src-995e402e14f8dd8c48efc6a191e9b8764700d617.tar.bz2 | |
Attemp 2 at:
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
TBR=finnur
Review URL: http://codereview.chromium.org/3056003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53204 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, 3 insertions, 12 deletions
diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/tab_menu_model.cc index 41667b2..6b8dc17 100644 --- a/chrome/browser/tab_menu_model.cc +++ b/chrome/browser/tab_menu_model.cc @@ -10,11 +10,9 @@ #include "grit/generated_resources.h" TabMenuModel::TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, - bool is_pinned, - bool allow_toolbar_toggle, - bool is_toolbar_visible) + bool is_pinned) : menus::SimpleMenuModel(delegate) { - Build(is_pinned, allow_toolbar_toggle, is_toolbar_visible); + Build(is_pinned); } // static @@ -29,8 +27,7 @@ bool TabMenuModel::AreVerticalTabsEnabled() { #endif } -void TabMenuModel::Build(bool is_pinned, bool allow_toolbar_toggle, - bool is_toolbar_visible) { +void TabMenuModel::Build(bool is_pinned) { AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB); AddSeparator(); AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD); @@ -39,12 +36,6 @@ void TabMenuModel::Build(bool is_pinned, bool allow_toolbar_toggle, 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); |