Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Unified Diff: chrome/browser/extensions/extension_host.h

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 2 Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_host.h
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 96aa74d4178ee335c36ac4809b232b92b099265c..34369164b2486fd96fd5a03ca9b08e6809ba6c32 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -31,7 +31,6 @@
#endif
class Browser;
-class Extension;
class ExtensionWindowController;
class PrefsTabHelper;
@@ -41,6 +40,10 @@ class RenderWidgetHostView;
class SiteInstance;
}
+namespace extensions {
+class Extension;
+}
+
// This class is the browser component of an extension component's RenderView.
// It handles setting up the renderer process, if needed, with special
// privileges available to extensions. It may have a view to be shown in the
@@ -63,7 +66,7 @@ class ExtensionHost : public content::WebContentsDelegate,
typedef ExtensionViewAndroid PlatformExtensionView;
#endif
- ExtensionHost(const Extension* extension,
+ ExtensionHost(const extensions::Extension* extension,
content::SiteInstance* site_instance,
const GURL& url, content::ViewType host_type);
virtual ~ExtensionHost();
@@ -92,7 +95,7 @@ class ExtensionHost : public content::WebContentsDelegate,
// instantiate Browser objects.
void CreateView(Browser* browser);
- const Extension* extension() const { return extension_; }
+ const extensions::Extension* extension() const { return extension_; }
const std::string& extension_id() const { return extension_id_; }
content::WebContents* host_contents() const { return host_contents_.get(); }
content::RenderViewHost* render_view_host() const;
@@ -197,7 +200,7 @@ class ExtensionHost : public content::WebContentsDelegate,
bool is_background_page() const { return !view(); }
// The extension that we're hosting in this view.
- const Extension* extension_;
+ const extensions::Extension* extension_;
// Id of extension that we're hosting in this view.
const std::string extension_id_;

Powered by Google App Engine
This is Rietveld 408576698