Index: chrome/browser/ui/views/extensions/extension_view.h |
diff --git a/chrome/browser/ui/views/extensions/extension_view.h b/chrome/browser/ui/views/extensions/extension_view.h |
index 09b0e989f2ac0c36c0405066cffeddde0e3762d1..926ddae17aa01e0ba2d1ee3c9a56d0ec64e5bac0 100644 |
--- a/chrome/browser/ui/views/extensions/extension_view.h |
+++ b/chrome/browser/ui/views/extensions/extension_view.h |
@@ -11,11 +11,11 @@ |
#include "ui/views/controls/native/native_view_host.h" |
class Browser; |
-class ExtensionHost; |
class ExtensionView; |
namespace extensions { |
class Extension; |
+class ExtensionHost; |
} |
namespace content { |
@@ -25,7 +25,7 @@ class RenderViewHost; |
// This handles the display portion of an ExtensionHost. |
class ExtensionView : public views::NativeViewHost { |
public: |
- ExtensionView(ExtensionHost* host, Browser* browser); |
+ ExtensionView(extensions::ExtensionHost* host, Browser* browser); |
virtual ~ExtensionView(); |
// A class that represents the container that this view is in. |
@@ -37,7 +37,7 @@ class ExtensionView : public views::NativeViewHost { |
virtual void OnViewWasResized() {} |
}; |
- ExtensionHost* host() const { return host_; } |
+ extensions::ExtensionHost* host() const { return host_; } |
Browser* browser() const { return browser_; } |
const extensions::Extension* extension() const; |
content::RenderViewHost* render_view_host() const; |
@@ -70,7 +70,7 @@ class ExtensionView : public views::NativeViewHost { |
virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE; |
private: |
- friend class ExtensionHost; |
+ friend class extensions::ExtensionHost; |
// Initializes the RenderWidgetHostView for this object. |
void CreateWidgetHostView(); |
@@ -84,7 +84,7 @@ class ExtensionView : public views::NativeViewHost { |
// The running extension instance that we're displaying. |
// Note that host_ owns view |
- ExtensionHost* host_; |
+ extensions::ExtensionHost* host_; |
// The browser window that this view is in. |
Browser* browser_; |