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

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

Issue 1490503002: MD Settings: Adding unit test for ResetSettingsHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments 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"
(...skipping 28 matching lines...) Expand all
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 StartupPagesHandler(web_ui)); 43 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
44 AddSettingsPageUIHandler(new SyncHandler(Profile::FromWebUI(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(new ResetSettingsHandler(html_source, web_ui)); 49 AddSettingsPageUIHandler(ResetSettingsHandler::Create(
50 html_source, Profile::FromWebUI(web_ui)));
50 51
51 // Add all settings resources. 52 // Add all settings resources.
52 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 53 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
53 html_source->AddResourcePath(kSettingsResources[i].name, 54 html_source->AddResourcePath(kSettingsResources[i].name,
54 kSettingsResources[i].value); 55 kSettingsResources[i].value);
55 } 56 }
56 57
57 AddLocalizedStrings(html_source, Profile::FromWebUI(web_ui)); 58 AddLocalizedStrings(html_source, Profile::FromWebUI(web_ui));
58 html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML); 59 html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML);
59 60
60 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), 61 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
61 html_source); 62 html_source);
62 } 63 }
63 64
64 MdSettingsUI::~MdSettingsUI() { 65 MdSettingsUI::~MdSettingsUI() {
65 } 66 }
66 67
67 void MdSettingsUI::AddSettingsPageUIHandler( 68 void MdSettingsUI::AddSettingsPageUIHandler(
68 content::WebUIMessageHandler* handler_raw) { 69 content::WebUIMessageHandler* handler_raw) {
69 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw); 70 scoped_ptr<content::WebUIMessageHandler> handler(handler_raw);
70 DCHECK(handler.get()); 71 DCHECK(handler.get());
71 72
72 web_ui()->AddMessageHandler(handler.release()); 73 web_ui()->AddMessageHandler(handler.release());
73 } 74 }
74 75
75 } // namespace settings 76 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/profile_resetter/profile_resetter.h ('k') | chrome/browser/ui/webui/settings/reset_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698