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

Unified Diff: chrome/browser/ui/browser.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/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 1f9b16e68cfddc5ef14124bcb6a97be93595145b..a6727b7ae08458357fd16fc40acba629dea46350 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -56,7 +56,6 @@ class BrowserSyncedWindowDelegate;
class BrowserToolbarModelDelegate;
class BrowserTabRestoreServiceDelegate;
class BrowserWindow;
-class Extension;
class ExtensionWindowController;
class FindBarController;
class FullscreenController;
@@ -76,6 +75,10 @@ class NavigationController;
class SessionStorageNamespace;
}
+namespace extensions {
+class Extension;
+}
+
namespace gfx {
class Point;
}
@@ -290,7 +293,7 @@ class Browser : public TabStripModelDelegate,
// |override_url| is used in place of the app launch url.
static content::WebContents* OpenApplication(
Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
extension_misc::LaunchContainer container,
const GURL& override_url,
WindowOpenDisposition disposition);
@@ -299,7 +302,7 @@ class Browser : public TabStripModelDelegate,
// Opens |url| in a new application panel window for the specified url.
static content::WebContents* OpenApplicationPanel(
Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& url);
#endif
@@ -312,7 +315,7 @@ class Browser : public TabStripModelDelegate,
// returned tab.
static content::WebContents* OpenApplicationWindow(
Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
extension_misc::LaunchContainer container,
const GURL& url,
Browser** app_browser);
@@ -332,7 +335,7 @@ class Browser : public TabStripModelDelegate,
// non-empty, |override_url| is used in place of the app launch url.
static content::WebContents* OpenApplicationTab(
Profile* profile,
- const Extension* extension,
+ const extensions::Extension* extension,
const GURL& override_url,
WindowOpenDisposition disposition);

Powered by Google App Engine
This is Rietveld 408576698