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

Unified Diff: chrome/browser/ui/extensions/shell_window.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/ui/extensions/shell_window.h
diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
index dec4dd82715e5dd53c26a4dd252db4d839d25537..b259629a249bb5b293d7cf7cfe8c8ba209f5f742 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -15,7 +15,6 @@
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/browser/web_contents_observer.h"
-class Extension;
class ExtensionWindowController;
class GURL;
class Profile;
@@ -24,6 +23,10 @@ namespace content {
class WebContents;
}
+namespace extensions {
+class Extension;
+}
+
// ShellWindow is the type of window used by platform apps. Shell windows
// have a WebContents but none of the chrome of normal browser windows.
class ShellWindow : public content::NotificationObserver,
@@ -33,7 +36,7 @@ class ShellWindow : public content::NotificationObserver,
public BaseWindow {
public:
static ShellWindow* Create(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url);
const SessionID& session_id() const { return session_id_; }
@@ -48,11 +51,11 @@ class ShellWindow : public content::NotificationObserver,
static const int kDefaultHeight = 384;
ShellWindow(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url);
virtual ~ShellWindow();
- const Extension* extension() const { return extension_; }
+ const extensions::Extension* extension() const { return extension_; }
content::WebContents* web_contents() const { return web_contents_.get(); }
private:
@@ -62,7 +65,7 @@ class ShellWindow : public content::NotificationObserver,
// Instantiates a platform-specific ShellWindow subclass (one implementation
// per platform). Public users of ShellWindow should use ShellWindow::Create.
static ShellWindow* CreateImpl(Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url);
// content::WebContentsObserver
@@ -84,7 +87,8 @@ class ShellWindow : public content::NotificationObserver,
void OnRequest(const ExtensionHostMsg_Request_Params& params);
Profile* profile_; // weak pointer - owned by ProfileManager.
- const Extension* extension_; // weak pointer - owned by ExtensionService.
+ // weak pointer - owned by ExtensionService.
+ const extensions::Extension* extension_;
const SessionID session_id_;
scoped_ptr<content::WebContents> web_contents_;

Powered by Google App Engine
This is Rietveld 408576698