summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/compact_location_bar_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/compact_location_bar_view.cc')
-rw-r--r--chrome/browser/chromeos/compact_location_bar_view.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/compact_location_bar_view.cc b/chrome/browser/chromeos/compact_location_bar_view.cc
index 28faefc..03434ea 100644
--- a/chrome/browser/chromeos/compact_location_bar_view.cc
+++ b/chrome/browser/chromeos/compact_location_bar_view.cc
@@ -130,7 +130,10 @@ void CompactLocationBarView::Init() {
location_entry_->Update(browser()->GetSelectedTabContents());
- browser_actions_ = new BrowserActionsContainer(browser(), this);
+ // Note: we tell the BrowserActionsContainer not to save its size because
+ // the main container is part of the ToolbarView, and we don't want them
+ // fighting. See http://code.google.com/p/chromium/issues/detail?id=38992
+ browser_actions_ = new BrowserActionsContainer(browser(), this, false);
AddChildView(browser_actions_);
}