diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:42:22 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:42:22 +0000 |
| commit | 199a703cb6a0127e1159c0571d0111b9fa7665cd (patch) | |
| tree | bace11700aaecbcb641f0b1bcf1ceccf676759ae /chrome/browser/chromeos/compact_location_bar_view.cc | |
| parent | 8131d7b56f3496d17f616598f0474bf6cf336864 (diff) | |
| download | chromium_src-199a703cb6a0127e1159c0571d0111b9fa7665cd.zip chromium_src-199a703cb6a0127e1159c0571d0111b9fa7665cd.tar.gz chromium_src-199a703cb6a0127e1159c0571d0111b9fa7665cd.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/chromeos/compact_location_bar_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/compact_location_bar_view.cc | 5 |
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_); } |