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

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

Issue 1323443006: [MD settings] pulling in chrome.send for using current pages for on startup pages] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit changes Created 5 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/settings_startup_pages_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/md_settings_localized_strings_provide r.h" 12 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
13 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
13 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
14 #include "chrome/grit/generated_resources.h" 15 #include "chrome/grit/generated_resources.h"
15 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
16 #include "content/public/browser/web_ui.h" 17 #include "content/public/browser/web_ui.h"
17 #include "content/public/browser/web_ui_data_source.h" 18 #include "content/public/browser/web_ui_data_source.h"
18 #include "grit/browser_resources.h" 19 #include "grit/browser_resources.h"
19 #include "grit/settings_resources.h" 20 #include "grit/settings_resources.h"
20 #include "grit/settings_resources_map.h" 21 #include "grit/settings_resources_map.h"
21 22
22 namespace settings { 23 namespace settings {
23 24
24 SettingsPageUIHandler::SettingsPageUIHandler() { 25 SettingsPageUIHandler::SettingsPageUIHandler() {
25 } 26 }
26 27
27 SettingsPageUIHandler::~SettingsPageUIHandler() { 28 SettingsPageUIHandler::~SettingsPageUIHandler() {
28 } 29 }
29 30
30 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui) 31 MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
31 : content::WebUIController(web_ui) { 32 : content::WebUIController(web_ui) {
32 AddSettingsPageUIHandler(new AppearanceHandler(web_ui)); 33 AddSettingsPageUIHandler(new AppearanceHandler(web_ui));
33 AddSettingsPageUIHandler(new DownloadsHandler()); 34 AddSettingsPageUIHandler(new DownloadsHandler());
35 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
34 36
35 content::WebUIDataSource* html_source = 37 content::WebUIDataSource* html_source =
36 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); 38 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
37 39
38 // Add all settings resources. 40 // Add all settings resources.
39 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 41 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
40 html_source->AddResourcePath(kSettingsResources[i].name, 42 html_source->AddResourcePath(kSettingsResources[i].name,
41 kSettingsResources[i].value); 43 kSettingsResources[i].value);
42 } 44 }
43 45
(...skipping 10 matching lines...) Expand all
54 56
55 void MdSettingsUI::AddSettingsPageUIHandler( 57 void MdSettingsUI::AddSettingsPageUIHandler(
56 settings::SettingsPageUIHandler* handler_raw) { 58 settings::SettingsPageUIHandler* handler_raw) {
57 scoped_ptr<settings::SettingsPageUIHandler> handler(handler_raw); 59 scoped_ptr<settings::SettingsPageUIHandler> handler(handler_raw);
58 DCHECK(handler.get()); 60 DCHECK(handler.get());
59 61
60 web_ui()->AddMessageHandler(handler.release()); 62 web_ui()->AddMessageHandler(handler.release());
61 } 63 }
62 64
63 } // namespace settings 65 } // namespace settings
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/settings_startup_pages_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698