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.h | |
| 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.h')
| -rw-r--r-- | chrome/browser/tab_menu_model.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/tab_menu_model.h b/chrome/browser/tab_menu_model.h index a910983..d0c29eb 100644 --- a/chrome/browser/tab_menu_model.h +++ b/chrome/browser/tab_menu_model.h @@ -15,14 +15,16 @@ class Browser; // of the tab a new TabMenuModel should be created each time the menu is shown. class TabMenuModel : public menus::SimpleMenuModel { public: - TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, bool is_pinned); + TabMenuModel(menus::SimpleMenuModel::Delegate* delegate, bool is_pinned, + bool allow_toolbar_toggle, bool is_toolbar_visible); virtual ~TabMenuModel() {} // Returns true if vertical tabs are enabled. static bool AreVerticalTabsEnabled(); private: - void Build(bool is_pinned); + void Build(bool is_pinned, bool allow_toolbar_toggle, + bool is_toolbar_visible); DISALLOW_COPY_AND_ASSIGN(TabMenuModel); }; |