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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix change_picture_handler to accomodate origin/master changes Created 4 years, 11 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 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/webui/settings/appearance_handler.h" 12 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
13 #include "chrome/browser/ui/webui/settings/downloads_handler.h" 13 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
14 #include "chrome/browser/ui/webui/settings/font_handler.h" 14 #include "chrome/browser/ui/webui/settings/font_handler.h"
15 #include "chrome/browser/ui/webui/settings/languages_handler.h" 15 #include "chrome/browser/ui/webui/settings/languages_handler.h"
16 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 16 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
17 #include "chrome/browser/ui/webui/settings/people_handler.h" 17 #include "chrome/browser/ui/webui/settings/people_handler.h"
18 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h" 18 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
19 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h" 19 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler. h"
20 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 20 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
21 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" 21 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_ui.h" 24 #include "content/public/browser/web_ui.h"
25 #include "content/public/browser/web_ui_data_source.h" 25 #include "content/public/browser/web_ui_data_source.h"
26 #include "grit/settings_resources.h" 26 #include "grit/settings_resources.h"
27 #include "grit/settings_resources_map.h" 27 #include "grit/settings_resources_map.h"
28 28
29 #if !defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
30 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
31 #else // !defined(OS_CHROMEOS)
30 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 32 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
31 #endif 33 #endif // defined(OS_CHROMEOS)
32 34
33 namespace settings { 35 namespace settings {
34 36
35 SettingsPageUIHandler::SettingsPageUIHandler() { 37 SettingsPageUIHandler::SettingsPageUIHandler() {
36 } 38 }
37 39
38 SettingsPageUIHandler::~SettingsPageUIHandler() { 40 SettingsPageUIHandler::~SettingsPageUIHandler() {
39 } 41 }
40 42
41 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) 43 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
42 : content::WebUIController(web_ui) { 44 : content::WebUIController(web_ui) {
43 Profile* profile = Profile::FromWebUI(web_ui); 45 Profile* profile = Profile::FromWebUI(web_ui);
44 AddSettingsPageUIHandler(new AppearanceHandler(web_ui)); 46 AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
45 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui)); 47 AddSettingsPageUIHandler(new ClearBrowsingDataHandler(web_ui));
46 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 48 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
47 AddSettingsPageUIHandler(new DownloadsHandler()); 49 AddSettingsPageUIHandler(new DownloadsHandler());
48 AddSettingsPageUIHandler(new FontHandler(web_ui)); 50 AddSettingsPageUIHandler(new FontHandler(web_ui));
49 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 51 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
50 AddSettingsPageUIHandler(new PeopleHandler(profile)); 52 AddSettingsPageUIHandler(new PeopleHandler(profile));
51 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 53 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
52 54
53 #if !defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
56 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
57 #else
54 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 58 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
55 #endif 59 #endif
56 60
57 content::WebUIDataSource* html_source = 61 content::WebUIDataSource* html_source =
58 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); 62 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
59 63
60 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 64 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
61 65
62 // Add all settings resources. 66 // Add all settings resources.
63 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 67 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
(...skipping 13 matching lines...) Expand all
77 81
78 void MdSettingsUI::AddSettingsPageUIHandler( 82 void MdSettingsUI::AddSettingsPageUIHandler(
79 content::WebUIMessageHandler* handler_raw) { 83 content::WebUIMessageHandler* handler_raw) {
80 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw); 84 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw);
81 DCHECK(handler.get()); 85 DCHECK(handler.get());
82 86
83 web_ui()->AddMessageHandler(handler.release()); 87 web_ui()->AddMessageHandler(handler.release());
84 } 88 }
85 89
86 } // namespace settings 90 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698