Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/webui/settings/appearance_handler.h" 10 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
11 #include "chrome/browser/ui/webui/settings/downloads_handler.h" 11 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
12 #include "chrome/browser/ui/webui/settings/font_handler.h" 12 #include "chrome/browser/ui/webui/settings/font_handler.h"
13 #include "chrome/browser/ui/webui/settings/languages_handler.h" 13 #include "chrome/browser/ui/webui/settings/languages_handler.h"
14 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 14 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
15 #include "chrome/browser/ui/webui/settings/people_handler.h"
15 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" 16 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
16 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" 17 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h"
17 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 18 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
18 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" 19 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
19 #include "chrome/browser/ui/webui/settings/sync_handler.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
22 #include "content/public/browser/web_ui.h" 22 #include "content/public/browser/web_ui.h"
23 #include "content/public/browser/web_ui_data_source.h" 23 #include "content/public/browser/web_ui_data_source.h"
24 #include "grit/settings_resources.h" 24 #include "grit/settings_resources.h"
25 #include "grit/settings_resources_map.h" 25 #include "grit/settings_resources_map.h"
26 26
27 namespace settings { 27 namespace settings {
28 28
29 SettingsPageUIHandler::SettingsPageUIHandler() { 29 SettingsPageUIHandler::SettingsPageUIHandler() {
30 } 30 }
31 31
32 SettingsPageUIHandler::~SettingsPageUIHandler() { 32 SettingsPageUIHandler::~SettingsPageUIHandler() {
33 } 33 }
34 34
35 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) 35 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
36 : content::WebUIController(web_ui) { 36 : content::WebUIController(web_ui) {
37 AddSettingsPageUIHandler(new AppearanceHandler(web_ui)); 37 AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
38 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 38 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
39 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 39 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
40 AddSettingsPageUIHandler(new DownloadsHandler()); 40 AddSettingsPageUIHandler(new DownloadsHandler());
41 AddSettingsPageUIHandler(new FontHandler(web_ui)); 41 AddSettingsPageUIHandler(new FontHandler(web_ui));
42 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 42 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
43 AddSettingsPageUIHandler(new PeopleHandler(Profile::FromWebUI(web_ui)));
43 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 44 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
44 AddSettingsPageUIHandler(new SyncHandler(Profile::FromWebUI(web_ui)));
45 45
46 content::WebUIDataSource* html_source = 46 content::WebUIDataSource* html_source =
47 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); 47 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
48 48
49 AddSettingsPageUIHandler(ResetSettingsHandler::Create( 49 AddSettingsPageUIHandler(ResetSettingsHandler::Create(
50 html_source, Profile::FromWebUI(web_ui))); 50 html_source, Profile::FromWebUI(web_ui)));
51 51
52 // Add all settings resources. 52 // Add all settings resources.
53 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 53 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
54 html_source->AddResourcePath(kSettingsResources[i].name, 54 html_source->AddResourcePath(kSettingsResources[i].name,
(...skipping 12 matching lines...) Expand all
67 67
68 void MdSettingsUI::AddSettingsPageUIHandler( 68 void MdSettingsUI::AddSettingsPageUIHandler(
69 content::WebUIMessageHandler* handler_raw) { 69 content::WebUIMessageHandler* handler_raw) {
70 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw); 70 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw);
71 DCHECK(handler.get()); 71 DCHECK(handler.get());
72 72
73 web_ui()->AddMessageHandler(handler.release()); 73 web_ui()->AddMessageHandler(handler.release());
74 } 74 }
75 75
76 } // namespace settings 76 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698