diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 17:59:18 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 17:59:18 +0000 |
| commit | 28b180310c12025dffd454c3a5b1a2c409ac9509 (patch) | |
| tree | 5294e512c67a03ec89c32098114e6ba880b84446 /chrome/browser/views/toolbar_view.h | |
| parent | 224c0ad4d0d66825b957812a06c0e65d8d811ea7 (diff) | |
| download | chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.zip chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.tar.gz chromium_src-28b180310c12025dffd454c3a5b1a2c409ac9509.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.h')
| -rw-r--r-- | chrome/browser/views/toolbar_view.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h index 5303ba8..83e28f6 100644 --- a/chrome/browser/views/toolbar_view.h +++ b/chrome/browser/views/toolbar_view.h @@ -79,8 +79,6 @@ class ToolbarView : public AccessibleToolbarView, ReloadButton* reload_button() const { return reload_; } LocationBarView* location_bar() const { return location_bar_; } views::MenuButton* app_menu() const { return app_menu_; } - bool collapsed() const { return collapsed_; } - void SetCollapsed(bool val); // Overridden from AccessibleToolbarView virtual bool SetToolbarFocus(int view_storage_id, View* initial_focus); @@ -215,9 +213,6 @@ class ToolbarView : public AccessibleToolbarView, // running. bool* destroyed_flag_; - // When collapsed, the toolbar is just a tiny strip, no controls are visible. - bool collapsed_; - DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView); }; |