Attemp 2 at:

chrome/browser/views/browser_actions_container.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/browser_actions_container.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/detachable_toolbar_view.h"
 #include "chrome/browser/views/extensions/browser_action_drag_data.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
-#include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 567 matching lines @@
   // other words: ContainerMinSize() < width() - resize < ClampTo(MAX).
   int width = std::max(ContainerMinSize(),
                        container_size_.width() - resize_amount_);
   int max_width = ClampToNearestIconCount(-1, false);  // -1 gives max width.
   width = std::min(width, max_width);
 
   return gfx::Size(width, kButtonSize);
 }
 
 void BrowserActionsContainer::Layout() {
-  // The parent can be visible, but collapsed. In this case we don't
-  // want the browser action container to be visible.
-  ToolbarView* parent = reinterpret_cast<ToolbarView*>(GetParent());
-
-  if (browser_action_views_.size() == 0 || parent->collapsed()) {
+  if (browser_action_views_.size() == 0) {
     SetVisible(false);
     resize_gripper_->SetVisible(false);
     chevron_->SetVisible(false);
     return;
   } else {
     SetVisible(true);
     resize_gripper_->SetVisible(true);
   }
 
   int x = 0;
@@ skipping 532 matching lines @@
   popup_ = NULL;
   popup_button_->SetButtonNotPushed();
   popup_button_ = NULL;
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return (!profile_->IsOffTheRecord() ||
           profile_->GetExtensionsService()->IsIncognitoEnabled(extension));
 }