| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 26999ee9d2b20e84cc5fe364f3fec259cf02b4b4..e11cc5d4de03efd118bf9ccbee57d6b1537fc2a3 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 ExtensionWindowController;
|
| 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();
|
| }
|
|
|
| @@ -551,7 +552,7 @@ class Browser : public TabHandlerDelegate,
|
| void ToggleFullscreenMode();
|
| // See the description of
|
| // FullscreenController::ToggleFullscreenModeWithExtension.
|
| - void ToggleFullscreenModeWithExtension(const Extension& extension);
|
| + void ToggleFullscreenModeWithExtension(const GURL& extension_url);
|
| #if defined(OS_MACOSX)
|
| void TogglePresentationMode();
|
| #endif
|
| @@ -885,6 +886,10 @@ class Browser : public TabHandlerDelegate,
|
| // Show the first run search engine bubble on the location bar.
|
| void ShowFirstRunBubble();
|
|
|
| + ExtensionWindowController* extension_window_controller() const {
|
| + return extension_window_controller_.get();
|
| + }
|
| +
|
| protected:
|
| // Wrapper for the factory method in BrowserWindow. This allows subclasses to
|
| // set their own window.
|
| @@ -1456,6 +1461,8 @@ class Browser : public TabHandlerDelegate,
|
|
|
| scoped_refptr<FullscreenController> fullscreen_controller_;
|
|
|
| + scoped_ptr<ExtensionWindowController> extension_window_controller_;
|
| +
|
| // True if the browser window has been shown at least once.
|
| bool window_has_shown_;
|
|
|
|
|