chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 1421893005: Settings Rewrite: Fork SyncSetupHandler for MD-Settings

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 1421893005: Settings Rewrite: Fork SyncSetupHandler for MD-Settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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:

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

Download patch

« no previous file with comments | « chrome/browser/ui/webui/options/sync_setup_handler_unittest.cc ('k') | chrome/browser/ui/webui/sync_setup_handler.h » ('j') | chrome/browser/ui/webui/sync_setup_handler_unittest.cc » ('J')
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 909afe7c3bcadbd39736cd71ac05a6157a5728ee..261f38a1c1284754318de561a5b33d313d664546 100644

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

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

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

#include <string>

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/ui/webui/options/sync_setup_handler.h"

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

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

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

@@ -16,6 +15,7 @@

#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/sync_setup_handler.h"

#include "chrome/common/url_constants.h"

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

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

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

AddSettingsPageUIHandler(new FontHandler(web_ui));

AddSettingsPageUIHandler(new LanguagesHandler(web_ui));

AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));

- AddSettingsPageUIHandler(new SyncSetupHandler());

+ AddSettingsPageUIHandler(new SyncSetupHandler(web_ui));

content::WebUIDataSource* html_source =

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