diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 07:31:37 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 07:31:37 +0000 |
| commit | ba1d37596d268085bc2cda97116bf6406f51f889 (patch) | |
| tree | 864fa4839ba7d08ef5b04f99652a3f73aca12aae /chrome/browser/ui/views/browser_actions_container.h | |
| parent | 21b20564756ca0064cf48609ef45ae1aa5a9a4b3 (diff) | |
| download | chromium_src-ba1d37596d268085bc2cda97116bf6406f51f889.zip chromium_src-ba1d37596d268085bc2cda97116bf6406f51f889.tar.gz chromium_src-ba1d37596d268085bc2cda97116bf6406f51f889.tar.bz2 | |
Rebase ExtensionPopup on the new views bubble.
Cuts out the BrowserBubble middleman complexity.
This also fixes crbug.com/105174
I filed crbug.com/105151, as popups don't really move with the browser window.
I took crbug.com/80416, as margins will regress with this CL.
BUG=80416,98323,105151,105174,105192
TEST=ExtensionPopup bubbles work as before (with two known issues).
Review URL: http://codereview.chromium.org/8632018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/browser_actions_container.h')
| -rw-r--r-- | chrome/browser/ui/views/browser_actions_container.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h index f536fad..0a76077 100644 --- a/chrome/browser/ui/views/browser_actions_container.h +++ b/chrome/browser/ui/views/browser_actions_container.h @@ -263,7 +263,7 @@ class BrowserActionsContainer public ExtensionToolbarModel::Observer, public BrowserActionOverflowMenuController::Observer, public ExtensionContextMenuModel::PopupDelegate, - public ExtensionPopup::Observer { + public views::Widget::Observer { public: BrowserActionsContainer(Browser* browser, views::View* owner_view); virtual ~BrowserActionsContainer(); @@ -358,8 +358,8 @@ class BrowserActionsContainer // Overridden from ExtensionContextMenuModel::PopupDelegate virtual void InspectPopup(ExtensionAction* action) OVERRIDE; - // Overriden from ExtensionPopup::Delegate - virtual void ExtensionPopupIsClosing(ExtensionPopup* popup) OVERRIDE; + // Overridden from views::Widget::Observer + virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; // Moves a browser action with |id| to |new_index|. void MoveBrowserAction(const std::string& extension_id, size_t new_index); |