chrome/browser/prefs/browser_prefs.cc - Issue 8992034: Merge 114608, 115692 to 963 (M17) branch.

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 8992034: Merge 114608, 115692 to 963 (M17) branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/

Patch Set: rebasing, checking for diffs before merge Created 9 years 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 4e01282173f47b24d766d6b1b91f6f6100f9418c..51fdbf964ef06dd0f4a7582e6ed41002a77c24e3 100644

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

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

@@ -58,7 +58,7 @@

#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

#include "chrome/browser/ui/webui/options/extension_settings_handler.h"

#include "chrome/browser/ui/webui/plugins_ui.h"

-#include "chrome/browser/ui/webui/sync_promo_ui.h"

+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

#include "chrome/browser/upgrade_detector.h"

#include "chrome/browser/web_resource/promo_resource_service.h"

#include "chrome/common/pref_names.h"

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/profiles/profile_manager.cc » ('j') | no next file with comments »