| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index d5e9d7299bb6a6e7c485cfcb253e50d12ff54a5d..849d302bed1667cd28a72e0d6788a0532b15c17f 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -91,6 +91,7 @@ class WebDialogDelegate;
|
| }
|
|
|
| namespace web_modal {
|
| +class PopupManager;
|
| class WebContentsModalDialogHost;
|
| }
|
|
|
| @@ -242,6 +243,9 @@ class Browser : public TabStripModelObserver,
|
| toolbar_model->swap(toolbar_model_);
|
| }
|
| #endif
|
| + web_modal::PopupManager* popup_manager() {
|
| + return popup_manager_.get();
|
| + }
|
| TabStripModel* tab_strip_model() const { return tab_strip_model_.get(); }
|
| chrome::BrowserCommandController* command_controller() {
|
| return command_controller_.get();
|
| @@ -819,6 +823,10 @@ class Browser : public TabStripModelObserver,
|
| // This Browser's window.
|
| BrowserWindow* window_;
|
|
|
| + // Manages popup windows (bubbles, tab-modals) visible overlapping this
|
| + // window. JS alerts are not handled by this manager.
|
| + scoped_ptr<web_modal::PopupManager> popup_manager_;
|
| +
|
| scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_;
|
| scoped_ptr<TabStripModel> tab_strip_model_;
|
|
|
|
|