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

Unified Diff: chrome/common/pepper_permission_util.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years 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/pepper_permission_util.h ('k') | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pepper_permission_util.cc
diff --git a/chrome/common/pepper_permission_util.cc b/chrome/common/pepper_permission_util.cc
index 92cf4d44da769c1bf8b5f57a7106f1695471ba17..a8e767539da0a18ca8112348597b9119d9cc604e 100644
--- a/chrome/common/pepper_permission_util.cc
+++ b/chrome/common/pepper_permission_util.cc
@@ -10,9 +10,9 @@
#include "base/sha1.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_tokenizer.h"
-#include "chrome/common/extensions/extension_set.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "extensions/common/manifest_handlers/shared_module_info.h"
using extensions::Extension;
@@ -36,7 +36,7 @@ bool HostIsInSet(const std::string& host, const std::set<std::string>& set) {
bool IsExtensionOrSharedModuleWhitelisted(
const GURL& url,
- const ExtensionSet* extension_set,
+ const extensions::ExtensionSet* extension_set,
const std::set<std::string>& whitelist) {
if (!url.is_valid() || !url.SchemeIs(extensions::kExtensionScheme))
return false;
@@ -70,7 +70,7 @@ bool IsExtensionOrSharedModuleWhitelisted(
}
bool IsHostAllowedByCommandLine(const GURL& url,
- const ExtensionSet* extension_set,
+ const extensions::ExtensionSet* extension_set,
const char* command_line_switch) {
if (!url.is_valid())
return false;
« no previous file with comments | « chrome/common/pepper_permission_util.h ('k') | chrome/renderer/chrome_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698