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

Unified Diff: chrome/browser/chrome_content_browser_client.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: ChromeOS fix Created 7 years, 4 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 | « no previous file | chrome/browser/extensions/activity_log/activity_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 4700b5a05296a28a7e77907c44ef75432b16282b..907bb829f7e9f1b072955c35326941c15ebaacd0 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -790,13 +790,6 @@ content::WebContentsViewDelegate*
return chrome::CreateWebContentsViewDelegate(web_contents);
}
-// Check if the extension activity log is enabled for the profile.
-static bool IsExtensionActivityLogEnabledForProfile(Profile* profile) {
- // crbug.com/247908 - This should be IsLogEnabled except for an issue
- // in chrome_frame_net_tests
- return extensions::ActivityLog::IsLogEnabledOnAnyProfile();
-}
-
void ChromeContentBrowserClient::GuestWebContentsCreated(
WebContents* guest_web_contents,
WebContents* opener_web_contents,
@@ -919,7 +912,7 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
profile->IsOffTheRecord()));
host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
- IsExtensionActivityLogEnabledForProfile(profile)));
+ extensions::ActivityLog::GetInstance(profile)->IsLogEnabled()));
SendExtensionWebRequestStatusToHost(host);
« no previous file with comments | « no previous file | chrome/browser/extensions/activity_log/activity_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698