| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 96bd1ee5611d13ad613a6ba9573e3553e6465957..80c880bfcf875d33f8bf5f96c6f769ae7cc55b90 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -56,6 +56,7 @@ class BrowserSyncedWindowDelegate;
|
| class BrowserTabRestoreServiceDelegate;
|
| class BrowserWindow;
|
| class Extension;
|
| +class ExtensionWindowWrapper;
|
| class FindBarController;
|
| class FullscreenController;
|
| class HtmlDialogUIDelegate;
|
| @@ -233,10 +234,10 @@ class Browser : public TabHandlerDelegate,
|
| const SessionID& session_id() const { return session_id_; }
|
| CommandUpdater* command_updater() { return &command_updater_; }
|
| bool block_command_execution() const { return block_command_execution_; }
|
| - BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() {
|
| + BrowserTabRestoreServiceDelegate* tab_restore_service_delegate() const {
|
| return tab_restore_service_delegate_.get();
|
| }
|
| - BrowserSyncedWindowDelegate* synced_window_delegate() {
|
| + BrowserSyncedWindowDelegate* synced_window_delegate() const {
|
| return synced_window_delegate_.get();
|
| }
|
|
|
| @@ -881,6 +882,10 @@ class Browser : public TabHandlerDelegate,
|
| // Show the first run search engine bubble on the location bar.
|
| void ShowFirstRunBubble();
|
|
|
| + ExtensionWindowWrapper* extension_window_wrapper() const {
|
| + return extension_window_wrapper_.get();
|
| + }
|
| +
|
| protected:
|
| // Wrapper for the factory method in BrowserWindow. This allows subclasses to
|
| // set their own window.
|
| @@ -1452,6 +1457,8 @@ class Browser : public TabHandlerDelegate,
|
|
|
| scoped_refptr<FullscreenController> fullscreen_controller_;
|
|
|
| + scoped_ptr<ExtensionWindowWrapper> extension_window_wrapper_;
|
| +
|
| // True if the browser window has been shown at least once.
|
| bool window_has_shown_;
|
|
|
|
|