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

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

Issue 18430004: Sets correct ActivityLog enabled status to the first renderer process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc
index 882034a4728113817d667776e696839c1adddbdb..c93d7f5933e46ea0dd75ffc254a0d60aac808f7e 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api.cc
@@ -1634,7 +1634,11 @@ void LogExtensionActivity(void* profile_id,
Profile* profile = static_cast<Profile*>(profile_id);
if (!g_browser_process->profile_manager()->IsValidProfile(profile))
return;
- extensions::ActivityLog::GetInstance(profile)->LogWebRequestAction(
+ extensions::ActivityLog* activity_log =
+ extensions::ActivityLog::GetInstance(profile);
+ if (!activity_log->IsLogEnabled())
+ return;
+ activity_log->LogWebRequestAction(
extension_id,
is_incognito ? GURL(extensions::APIAction::kIncognitoUrl) : url,
api_call,
@@ -1666,14 +1670,12 @@ void ExtensionWebRequestEventRouter::DecrementBlockCount(
helpers::EventResponseDelta* delta =
CalculateDelta(&blocked_request, response);
- if (extensions::ActivityLog::IsLogEnabledOnAnyProfile()) {
- LogExtensionActivity(profile,
- blocked_request.is_incognito,
- extension_id,
- blocked_request.request->url(),
- event_name,
- SummarizeResponseDelta(event_name, *delta));
- }
+ LogExtensionActivity(profile,
+ blocked_request.is_incognito,
+ extension_id,
+ blocked_request.request->url(),
+ event_name,
+ SummarizeResponseDelta(event_name, *delta));
blocked_request.response_deltas.push_back(
linked_ptr<helpers::EventResponseDelta>(delta));

Powered by Google App Engine
This is Rietveld 408576698