diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 17:18:11 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 17:18:11 +0000 |
| commit | 62c293e4b24a1a4305a02807dd3dc36d72ff3a17 (patch) | |
| tree | c4a0e55c82f89901c34d579cc8639111612bba82 | |
| parent | 5eea116d26ede67503c4ac8565d047e0182ab049 (diff) | |
| download | chromium_src-62c293e4b24a1a4305a02807dd3dc36d72ff3a17.zip chromium_src-62c293e4b24a1a4305a02807dd3dc36d72ff3a17.tar.gz chromium_src-62c293e4b24a1a4305a02807dd3dc36d72ff3a17.tar.bz2 | |
When in collapsed mode, the toolbar should not show the resize gripper.
BUG=None
TEST=With one or more browser action installed, look at the toolbar while a nano tab is selected and make sure there are no vertical lines right below the tabstrip.
Review URL: http://codereview.chromium.org/1998016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46930 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/browser_actions_container.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index e8e4f99..2103108 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -24,6 +24,7 @@ #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" @@ -599,7 +600,11 @@ gfx::Size BrowserActionsContainer::GetPreferredSize() { } void BrowserActionsContainer::Layout() { - if (browser_action_views_.size() == 0) { + // 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()) { SetVisible(false); resize_gripper_->SetVisible(false); chevron_->SetVisible(false); |