Chromium Code Reviews| Index: chrome/browser/ui/browser.h |
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h |
| index 362d85a679987c6b877490bdc4797511cc8a8afe..1734cb7f8ec18fd7cb835f7c6dd78d16ca761ba5 100644 |
| --- a/chrome/browser/ui/browser.h |
| +++ b/chrome/browser/ui/browser.h |
| @@ -23,6 +23,7 @@ |
| #include "chrome/browser/ui/bookmarks/bookmark_bar.h" |
| #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" |
| #include "chrome/browser/ui/browser_navigator.h" |
| +#include "chrome/browser/ui/chrome_bubble_manager.h" |
| #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h" |
| #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| #include "chrome/browser/ui/host_desktop.h" |
| @@ -247,6 +248,9 @@ class Browser : public TabStripModelObserver, |
| // |window()| will return NULL if called before |CreateBrowserWindow()| |
| // is done. |
| BrowserWindow* window() const { return window_; } |
| + base::WeakPtr<ChromeBubbleManager> bubble_manager() { |
|
msw
2015/08/18 17:26:18
Should this be a raw pointer? None of the callers
msw
2015/08/18 17:26:19
nit: order this below more vital/prominent members
hcarmona
2015/08/18 23:08:47
Done.
hcarmona
2015/08/18 23:08:47
Done.
|
| + return bubble_manager_.AsWeakPtr(); |
| + } |
| ToolbarModel* toolbar_model() { return toolbar_model_.get(); } |
| const ToolbarModel* toolbar_model() const { return toolbar_model_.get(); } |
| #if defined(UNIT_TEST) |
| @@ -853,6 +857,8 @@ class Browser : public TabStripModelObserver, |
| // This Browser's window. |
| BrowserWindow* window_; |
| + ChromeBubbleManager bubble_manager_; |
|
msw
2015/08/18 17:26:19
ditto nit: order lower.
msw
2015/08/18 17:26:19
nit: should this be created lazily? (it won't alwa
hcarmona
2015/08/18 23:08:47
Done.
hcarmona
2015/08/18 23:08:47
Done.
|
| + |
| scoped_ptr<TabStripModelDelegate> tab_strip_model_delegate_; |
| scoped_ptr<TabStripModel> tab_strip_model_; |