Attemp 2 at:

chrome/browser/browser.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1133 matching lines @@
     features |= FEATURE_EXTENSIONSHELF;
   }
 
   if (!hide_ui_for_fullscreen) {
     if (type() != TYPE_NORMAL && type() != TYPE_EXTENSION_APP)
       features |= FEATURE_TITLEBAR;
 
     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;
 
     if (type() != TYPE_EXTENSION_APP && (type() & Browser::TYPE_APP) == 0)
       features |= FEATURE_LOCATIONBAR;
   }
   return !!(features & feature);
 }
 
 bool Browser::IsClosingPermitted() {
@@ skipping 1193 matching lines @@
 
 bool Browser::UseVerticalTabs() const {
   return use_vertical_tabs_.GetValue();
 }
 
 void Browser::ToggleUseVerticalTabs() {
   use_vertical_tabs_.SetValue(!UseVerticalTabs());
   UseVerticalTabsChanged();
 }
 
-void Browser::SetToolbarVisibility(bool visible) {
-  window()->SetToolbarCollapsedMode(!visible);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelObserver implementation:
 
 void Browser::TabInsertedAt(TabContents* contents,
                             int index,
                             bool foreground) {
   contents->set_delegate(this);
   contents->controller().SetWindowID(session_id());
 
   SyncHistoryWithTabs(index);
@@ skipping 63 matching lines @@
 
   // Update sessions. Don't force creation of sessions. If sessions doesn't
   // exist, the change will be picked up by sessions when created.
   if (profile_->HasSessionService()) {
     SessionService* session_service = profile_->GetSessionService();
     if (session_service && !tabstrip_model_.closing_all()) {
       session_service->SetSelectedTabInWindow(
           session_id(), tabstrip_model_.selected_index());
     }
   }
-
-  window()->SetToolbarCollapsedMode(!tabstrip_model_.IsToolbarVisible(index));
 }
 
 void Browser::TabMoved(TabContents* contents,
                        int from_index,
                        int to_index) {
   DCHECK(from_index >= 0 && to_index >= 0);
   // Notify the history service.
   SyncHistoryWithTabs(std::min(from_index, to_index));
 }
 
@@ skipping 1568 matching lines @@
 }
 
 bool Browser::IsPinned(TabContents* source) {
   int index = tabstrip_model_.GetIndexOfTabContents(source);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED() << "IsPinned called for tab not in our strip";
     return false;
   }
   return tabstrip_model_.IsTabPinned(index);
 }