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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_permissions.cc

Issue 14651017: Move RuntimeData and related permissions out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_permissions
Patch Set: Latest master Created 7 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/extensions/api/web_request/web_request_permissions.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index cf981c915e81c48ff6d93e3ad3071727ee509f5d..e67a160adeb3dc35dc0e71bb4e10993c26fe73c8 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_info_map.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/permissions/permissions_data.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/resource_request_info.h"
#include "extensions/common/constants.h"
@@ -24,7 +25,7 @@ namespace {
// to check for updates, extension blacklisting, etc.
bool IsSensitiveURL(const GURL& url) {
// TODO(battre) Merge this, CanExtensionAccessURL and
- // Extension::CanExecuteScriptOnPage into one function.
+ // PermissionsData::CanExecuteScriptOnPage into one function.
bool sensitive_chrome_url = false;
const std::string host = url.host();
const char kGoogleCom[] = ".google.com";
@@ -118,12 +119,13 @@ bool WebRequestPermissions::CanExtensionAccessURL(
// about: URLs are not covered in host permissions, but are allowed
// anyway.
if (!((url.SchemeIs(chrome::kAboutScheme) ||
- extension->HasHostPermission(url) ||
- url.GetOrigin() == extension->url())))
+ extensions::PermissionsData::HasHostPermission(extension, url) ||
+ url.GetOrigin() == extension->url()))) {
return false;
+ }
break;
case REQUIRE_ALL_URLS:
- if (!extension->HasEffectiveAccessToAllHosts())
+ if (!extensions::PermissionsData::HasEffectiveAccessToAllHosts(extension))
return false;
break;
}
« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_api.cc ('k') | chrome/browser/extensions/extension_install_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698