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/browser.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/browser.cc')
| -rw-r--r-- | chrome/browser/browser.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 3ad0276..b9457e7 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -1150,9 +1150,6 @@ bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, if (type() == TYPE_NORMAL || type() == TYPE_EXTENSION_APP) features |= FEATURE_TABSTRIP; - // TODO(aa): This is kinda a hack. The toolbar is not really there, it is - // collapsed. We probably want to add a FEATURE_MINI_TOOLBAR to represent - // the collapsed state. if (type() == TYPE_NORMAL || type() == TYPE_EXTENSION_APP) features |= FEATURE_TOOLBAR; @@ -2366,10 +2363,6 @@ void Browser::ToggleUseVerticalTabs() { UseVerticalTabsChanged(); } -void Browser::SetToolbarVisibility(bool visible) { - window()->SetToolbarCollapsedMode(!visible); -} - /////////////////////////////////////////////////////////////////////////////// // Browser, TabStripModelObserver implementation: @@ -2453,8 +2446,6 @@ void Browser::TabSelectedAt(TabContents* old_contents, session_id(), tabstrip_model_.selected_index()); } } - - window()->SetToolbarCollapsedMode(!tabstrip_model_.IsToolbarVisible(index)); } void Browser::TabMoved(TabContents* contents, |