Attemp 2 at:

chrome/browser/views/toolbar_view.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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
@@ skipping 40 matching lines @@
 // Separation between the location bar and the menus.
 static const int kMenuButtonOffset = 3;
 
 // Padding to the right of the location bar
 static const int kPaddingRight = 2;
 
 static const int kPopupTopSpacingNonGlass = 3;
 static const int kPopupBottomSpacingNonGlass = 2;
 static const int kPopupBottomSpacingGlass = 1;
 
-// The height of the toolbar when it is in collapsed mode.
-const int kCollapsedToolbarHeight = 7;
-
 static SkBitmap* kPopupBackgroundEdge = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
       forward_(NULL),
       home_(NULL),
       reload_(NULL),
       location_bar_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       profile_(NULL),
       browser_(browser),
       profiles_menu_contents_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
-      destroyed_flag_(NULL),
-      collapsed_(false) {
+      destroyed_flag_(NULL) {
   SetID(VIEW_ID_TOOLBAR);
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
 
   display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
@@ skipping 122 matching lines @@
 void ToolbarView::RemoveMenuListener(views::MenuListener* listener) {
   for (std::vector<views::MenuListener*>::iterator i(menu_listeners_.begin());
        i != menu_listeners_.end(); ++i) {
     if (*i == listener) {
       menu_listeners_.erase(i);
       return;
     }
   }
 }
 
-void ToolbarView::SetCollapsed(bool val) {
-  if (collapsed_ == val)
-    return;
-
-  collapsed_ = val;
-
-  // When switching to and from collapsed view, we need to force hide/show the
-  // location bar entry view, like we do when we switch to full screen mode in
-  // BrowserView::ProcessFullscreen. Otherwise the text view can appear floating
-  // on top of web content.
-  if (collapsed_)
-    location_bar_->PushForceHidden();
-  else
-    location_bar_->PopForceHidden();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, AccessibleToolbarView overrides:
 
 bool ToolbarView::SetToolbarFocus(
     int view_storage_id, views::View* initial_focus) {
   if (!AccessibleToolbarView::SetToolbarFocus(view_storage_id, initial_focus))
     return false;
 
   location_bar_->SetShowFocusRect(true);
   return true;
@@ skipping 157 matching lines @@
         browser_actions_->GetPreferredSize().width() +
         kMenuButtonOffset +
         app_menu_->GetPreferredSize().width() + kPaddingRight;
 
     static SkBitmap normal_background;
     if (normal_background.isNull()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
 
-    return gfx::Size(min_width,
-        collapsed_ ? kCollapsedToolbarHeight : normal_background.height());
+    return gfx::Size(min_width, normal_background.height());
   }
 
   int vertical_spacing = PopupTopSpacing() +
       (GetWindow()->GetNonClientView()->UseNativeFrame() ?
           kPopupBottomSpacingGlass : kPopupBottomSpacingNonGlass);
   return gfx::Size(0, location_bar_->GetPreferredSize().height() +
       vertical_spacing);
 }
 
 void ToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
   if (back_ == NULL)
     return;
 
   if (!IsDisplayModeNormal()) {
     int edge_width = (browser_->window() && browser_->window()->IsMaximized()) ?
         0 : kPopupBackgroundEdge->width();  // See Paint().
     location_bar_->SetBounds(edge_width, PopupTopSpacing(),
         width() - (edge_width * 2), location_bar_->GetPreferredSize().height());
     return;
   }
 
-  // In collapsed mode, we don't show any of the child controls.
-  for (int i = 0; i < GetChildViewCount(); ++i)
-    GetChildViewAt(i)->SetVisible(!collapsed_);
-
   int child_y = std::min(kControlVertOffset, height());
   // We assume all child elements are the same height.
   int child_height =
       std::min(back_->GetPreferredSize().height(), height() - child_y);
 
   // If the window is maximized, we extend the back button to the left so that
   // clicking on the left-most pixel will activate the back button.
   // TODO(abarth):  If the window becomes maximized but is not resized,
   //                then Layout() might not be called and the back button
   //                will be slightly the wrong size.  We should force a
@@ skipping 225 matching lines @@
   }
 #endif
 
   // Tell the menu button to activate, opening its pop-up menu.
   menu_button->Activate();
 
 #if defined(OS_WIN)
   SetToolbarFocus(NULL, menu_button);
 #endif
 }