From 199a703cb6a0127e1159c0571d0111b9fa7665cd Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Thu, 25 Mar 2010 17:42:22 +0000 Subject: Fix BrowserActionsContainerTest.Visibility for chromeos and reenable it. BUG=38992 Review URL: http://codereview.chromium.org/1310001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42636 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/chromeos/compact_location_bar_view.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chrome/browser/chromeos/compact_location_bar_view.cc') 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_); } -- cgit v1.1