chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People.

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/ui/webui/settings/md_settings_ui.cc

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge upstream changes Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chrome/browser/ui/webui/settings/people_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_ui.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc

index 88faceb8bfcc34ab2d9be7e6f2507671df005556..1fd56bf1f249fbf0f10194e8f636e55b964d8b23 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -12,11 +12,11 @@

#include "chrome/browser/ui/webui/settings/font_handler.h"

#include "chrome/browser/ui/webui/settings/languages_handler.h"

#include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"

+#include "chrome/browser/ui/webui/settings/people_handler.h"

#include "chrome/browser/ui/webui/settings/reset_settings_handler.h"

#include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h"

#include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"

#include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"

-#include "chrome/browser/ui/webui/settings/sync_handler.h"

#include "chrome/common/url_constants.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_ui.h"

@@ -40,8 +40,8 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)

AddSettingsPageUIHandler(new DownloadsHandler());

AddSettingsPageUIHandler(new FontHandler(web_ui));

AddSettingsPageUIHandler(new LanguagesHandler(web_ui));

+ AddSettingsPageUIHandler(new PeopleHandler(Profile::FromWebUI(web_ui)));

AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));

- AddSettingsPageUIHandler(new SyncHandler(Profile::FromWebUI(web_ui)));

content::WebUIDataSource* html_source =

content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);