chrome/browser/prefs/browser_prefs.cc - Issue 18430004: Sets correct ActivityLog enabled status to the first renderer process

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.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:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 8e3fcb30811fe18c624e54fa3394bffe5cb334c3..96b8d3a8dd2fb5b40bf467139f19f4ab7e9fbdb7 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/devtools/devtools_window.h"

#include "chrome/browser/download/download_prefs.h"

+#include "chrome/browser/extensions/activity_log/activity_log.h"

#include "chrome/browser/extensions/api/commands/command_service.h"

#include "chrome/browser/extensions/api/tabs/tabs_api.h"

#include "chrome/browser/extensions/extension_prefs.h"

@@ -325,6 +326,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {

SessionStartupPref::RegisterProfilePrefs(registry);

TemplateURLPrepopulateData::RegisterProfilePrefs(registry);

TranslatePrefs::RegisterProfilePrefs(registry);

+ extensions::ActivityLog::RegisterProfilePrefs(registry);

#if defined(ENABLE_AUTOFILL_DIALOG)

autofill::AutofillDialogController::RegisterProfilePrefs(registry);