summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.cc
diff options
context:
space:
mode:
authorpmarch@chromium.org <pmarch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 01:18:44 +0000
committerpmarch@chromium.org <pmarch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-14 01:18:44 +0000
commit42c94c7c60a6edac354da55f3c00166e68904629 (patch)
tree73619b113938f3c65fb8627d4a33f9a54aaef366 /chrome/browser/chrome_content_browser_client.cc
parent2de96a5be054130c08155a2d5c6073c3e9f8dd2a (diff)
downloadchromium_src-42c94c7c60a6edac354da55f3c00166e68904629.zip
chromium_src-42c94c7c60a6edac354da55f3c00166e68904629.tar.gz
chromium_src-42c94c7c60a6edac354da55f3c00166e68904629.tar.bz2
Sets correct ActivityLog enabled status to the first renderer process
BUG=247908 Review URL: https://chromiumcodereview.appspot.com/18430004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
-rw-r--r--chrome/browser/chrome_content_browser_client.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 7823264..f4b2411 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -781,13 +781,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,
@@ -910,7 +903,7 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
profile->IsOffTheRecord()));
host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
- IsExtensionActivityLogEnabledForProfile(profile)));
+ extensions::ActivityLog::GetInstance(profile)->IsLogEnabled()));
SendExtensionWebRequestStatusToHost(host);