summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/browser_actions_container.h
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 17:42:22 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 17:42:22 +0000
commit199a703cb6a0127e1159c0571d0111b9fa7665cd (patch)
treebace11700aaecbcb641f0b1bcf1ceccf676759ae /chrome/browser/views/browser_actions_container.h
parent8131d7b56f3496d17f616598f0474bf6cf336864 (diff)
downloadchromium_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/views/browser_actions_container.h')
-rw-r--r--chrome/browser/views/browser_actions_container.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
index 58ec5ed..45cfaf9 100644
--- a/chrome/browser/views/browser_actions_container.h
+++ b/chrome/browser/views/browser_actions_container.h
@@ -246,7 +246,10 @@ class BrowserActionsContainer
public ExtensionContextMenuModel::PopupDelegate,
public ExtensionPopup::Observer {
public:
- BrowserActionsContainer(Browser* browser, views::View* owner_view);
+ // If |should_save_size| is false, container resizes will not persist across
+ // browser restarts.
+ BrowserActionsContainer(Browser* browser, views::View* owner_view,
+ bool should_save_size);
virtual ~BrowserActionsContainer();
static void RegisterUserPrefs(PrefService* prefs);
@@ -435,6 +438,9 @@ class BrowserActionsContainer
// The view that owns us.
views::View* owner_view_;
+ // True if we should save the size of the container to the global prefs.
+ bool should_save_size_;
+
// The current popup and the button it came from. NULL if no popup.
ExtensionPopup* popup_;