Index: chrome/browser/ui/views/extensions/extension_dialog.h |
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.h b/chrome/browser/ui/views/extensions/extension_dialog.h |
index e52485c1b05e5f0d4d46657579dc7a2547bd2cfd..882747d7fc0bd573f34a799ee54d8de6988a146b 100644 |
--- a/chrome/browser/ui/views/extensions/extension_dialog.h |
+++ b/chrome/browser/ui/views/extensions/extension_dialog.h |
@@ -13,7 +13,6 @@ |
class BaseWindow; |
class ExtensionDialogObserver; |
-class ExtensionHost; |
class GURL; |
class Profile; |
@@ -21,6 +20,10 @@ namespace content { |
class WebContents; |
} |
+namespace extensions { |
+class ExtensionHost; |
+} |
+ |
// Modal dialog containing contents provided by an extension. |
// Dialog is automatically centered in the owning window and has fixed size. |
// For example, used by the Chrome OS file browser. |
@@ -76,7 +79,7 @@ class ExtensionDialog : public views::WidgetDelegate, |
// Sets minimum contents size in pixels and makes the window resizable. |
void SetMinimumContentsSize(int width, int height); |
- ExtensionHost* host() const { return extension_host_.get(); } |
+ extensions::ExtensionHost* host() const { return extension_host_.get(); } |
// views::WidgetDelegate overrides. |
virtual bool CanResize() const OVERRIDE; |
@@ -101,19 +104,20 @@ class ExtensionDialog : public views::WidgetDelegate, |
friend class base::RefCounted<ExtensionDialog>; |
// Use Show() to create instances. |
- ExtensionDialog(ExtensionHost* host, ExtensionDialogObserver* observer); |
+ ExtensionDialog(extensions::ExtensionHost* host, |
+ ExtensionDialogObserver* observer); |
static ExtensionDialog* ShowInternal(const GURL& url, |
BaseWindow* base_window, |
- ExtensionHost* host, |
+ extensions::ExtensionHost* host, |
int width, |
int height, |
bool fullscreen, |
const string16& title, |
ExtensionDialogObserver* observer); |
- static ExtensionHost* CreateExtensionHost(const GURL& url, |
- Profile* profile); |
+ static extensions::ExtensionHost* CreateExtensionHost(const GURL& url, |
+ Profile* profile); |
void InitWindow(BaseWindow* base_window, int width, int height); |
void InitWindowFullscreen(); |
@@ -125,7 +129,7 @@ class ExtensionDialog : public views::WidgetDelegate, |
string16 window_title_; |
// The contained host for the view. |
- scoped_ptr<ExtensionHost> extension_host_; |
+ scoped_ptr<extensions::ExtensionHost> extension_host_; |
content::NotificationRegistrar registrar_; |