chrome/browser/prefs/browser_prefs.cc - Issue 938713004: Add Now setting and migration logic.

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 938713004: Add Now setting and migration logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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 635f01e771e62bfff8847d5cf1de23a42e8865ab..c9e24e0b6f25581e05c12cc1b08106cf3dc4f474 100644

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

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

@@ -62,6 +62,7 @@

#include "chrome/browser/task_manager/task_manager.h"

#include "chrome/browser/ui/app_list/app_list_prefs.h"

#include "chrome/browser/ui/app_list/app_list_service.h"

+#include "chrome/browser/ui/app_list/google_now_extension.h"

#include "chrome/browser/ui/browser_ui_prefs.h"

#include "chrome/browser/ui/navigation_correction_tab_observer.h"

#include "chrome/browser/ui/network_profile_bubble.h"

@@ -574,6 +575,10 @@ void MigrateUserPrefs(Profile* profile) {

#if defined(OS_MACOSX) && !defined(OS_IOS)

autofill::AutofillManager::MigrateUserPrefs(prefs);

#endif // defined(OS_MACOSX) && !defined(OS_IOS)

+#if defined(OS_CHROMEOS) && defined(ENABLE_APP_LIST)

+ MigrateGoogleNowPrefs(profile);

+#endif

}

void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {