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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.h

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 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/webui/extensions/extension_settings_handler.h
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
index fb2219242c04014f1cec46a633a484d4469b74dd..ff6804c557dbde5ee458b2ffb49d5b83a936147d 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
@@ -25,7 +25,6 @@
#include "content/public/browser/web_ui_message_handler.h"
#include "googleurl/src/gurl.h"
-class Extension;
class ExtensionHost;
class ExtensionService;
class FilePath;
@@ -36,6 +35,10 @@ class DictionaryValue;
class ListValue;
}
+namespace extensions {
+class Extension;
+}
+
// Information about a page running in an extension, for example a popup bubble,
// a background page, or a tab contents.
struct ExtensionPage {
@@ -67,7 +70,7 @@ class ExtensionSettingsHandler : public content::WebUIMessageHandler,
// testing.
// Note: |warning_set| can be NULL in unit tests.
base::DictionaryValue* CreateExtensionDetailValue(
- const Extension* extension,
+ const extensions::Extension* extension,
const std::vector<ExtensionPage>& pages,
const ExtensionWarningSet* warning_set);
@@ -144,7 +147,7 @@ class ExtensionSettingsHandler : public content::WebUIMessageHandler,
// Utility for callbacks that get an extension ID as the sole argument.
// Returns NULL if the extension isn't active.
- const Extension* GetActiveExtension(const base::ListValue* args);
+ const extensions::Extension* GetActiveExtension(const base::ListValue* args);
// Forces a UI update if appropriate after a notification is received.
void MaybeUpdateAfterNotification();
@@ -154,7 +157,7 @@ class ExtensionSettingsHandler : public content::WebUIMessageHandler,
// Helper that lists the current inspectable html pages for an extension.
std::vector<ExtensionPage> GetInspectablePagesForExtension(
- const Extension* extension, bool extension_is_enabled);
+ const extensions::Extension* extension, bool extension_is_enabled);
void GetInspectablePagesForExtensionProcess(
const std::set<content::RenderViewHost*>& views,
std::vector<ExtensionPage> *result);

Powered by Google App Engine
This is Rietveld 408576698