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

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

Issue 131743021: app_shell: Extract extension runtime data from ExtensionService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, RuntimeDataTest tweak, win warning Created 6 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
Index: chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
index 84df3507906bb51ab24e3206d75d503e2f10e513..d1d73b6e941631e9aa030d22bd9b5e42bc1ccb1a 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc
@@ -14,13 +14,13 @@
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/web_request/web_request_api.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_warning_set.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_host/web_cache_manager.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
+#include "extensions/browser/runtime_data.h"
#include "net/base/net_log.h"
#include "net/cookies/cookie_util.h"
#include "net/cookies/parsed_cookie.h"
@@ -1264,9 +1264,11 @@ void NotifyWebRequestAPIUsed(
if (!g_browser_process->profile_manager()->IsValidProfile(profile))
return;
- if (profile->GetExtensionService()->HasUsedWebRequest(extension.get()))
+ extensions::RuntimeData* runtime_data =
+ extensions::ExtensionSystem::Get(profile)->runtime_data();
+ if (runtime_data->HasUsedWebRequest(extension.get()))
return;
- profile->GetExtensionService()->SetHasUsedWebRequest(extension.get(), true);
+ runtime_data->SetHasUsedWebRequest(extension.get(), true);
content::BrowserContext* browser_context = profile;
for (content::RenderProcessHost::iterator it =
« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_api.cc ('k') | chrome/browser/extensions/extension_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698