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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
« no previous file with comments | « chrome/common/extensions/unpacker_unittest.cc ('k') | chrome/renderer/extensions/dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 11391d7d48b31e21278bdd382d13bebb344c8168..3e65e3d75f02b7c6cddc1ae10454f443212b5394 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -349,7 +349,7 @@ std::string ChromeContentRendererClient::GetDefaultEncoding() {
return l10n_util::GetStringUTF8(IDS_DEFAULT_ENCODING);
}
-const extensions::Extension* ChromeContentRendererClient::GetExtension(
+const Extension* ChromeContentRendererClient::GetExtension(
const WebSecurityOrigin& origin) const {
if (!EqualsASCII(origin.protocol(), extensions::kExtensionScheme))
return NULL;
@@ -372,7 +372,7 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
switches::kEnableBrowserPluginForAllViewTypes))
return false;
WebDocument document = frame->document();
- const extensions::Extension* extension =
+ const Extension* extension =
GetExtension(document.securityOrigin());
if (extension && extension->HasAPIPermission(
extensions::APIPermission::kWebView))
@@ -520,8 +520,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
extension && extension->from_webstore();
// Allow built-in extensions and extensions under development.
bool is_extension_unrestricted = extension &&
- (extension->location() == Extension::COMPONENT ||
- extension->location() == Extension::LOAD);
+ (extension->location() == extensions::Manifest::COMPONENT ||
+ extension->location() == extensions::Manifest::LOAD);
GURL top_url = frame->top()->document().url();
if (!IsNaClAllowed(manifest_url,
top_url,
« no previous file with comments | « chrome/common/extensions/unpacker_unittest.cc ('k') | chrome/renderer/extensions/dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698