| Index: chrome/browser/ui/browser.h
|
| diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
|
| index 97570279e460cd244b11bf024bc6571389c8cfeb..315af0225691f68d5a4d55e268e8a6764caa80cd 100644
|
| --- a/chrome/browser/ui/browser.h
|
| +++ b/chrome/browser/ui/browser.h
|
| @@ -49,7 +49,6 @@ class BrowserSyncedWindowDelegate;
|
| class BrowserToolbarModelDelegate;
|
| class BrowserTabRestoreServiceDelegate;
|
| class BrowserWindow;
|
| -class ExtensionWindowController;
|
| class FindBarController;
|
| class FullscreenController;
|
| class PrefService;
|
| @@ -78,6 +77,7 @@ class SessionStorageNamespace;
|
|
|
| namespace extensions {
|
| class Extension;
|
| +class WindowController;
|
| }
|
|
|
| namespace gfx {
|
| @@ -480,7 +480,7 @@ class Browser : public TabStripModelObserver,
|
| return fullscreen_controller_.get();
|
| }
|
|
|
| - ExtensionWindowController* extension_window_controller() const {
|
| + extensions::WindowController* extension_window_controller() const {
|
| return extension_window_controller_.get();
|
| }
|
|
|
| @@ -917,7 +917,7 @@ class Browser : public TabStripModelObserver,
|
|
|
| scoped_refptr<FullscreenController> fullscreen_controller_;
|
|
|
| - scoped_ptr<ExtensionWindowController> extension_window_controller_;
|
| + scoped_ptr<extensions::WindowController> extension_window_controller_;
|
|
|
| scoped_ptr<chrome::BrowserCommandController> command_controller_;
|
|
|
|
|