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

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

Issue 1753653002: MD Settings: First half of Device > Keyboard sub-page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 9 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
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 24 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
25 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
26 #include "content/public/browser/web_contents.h" 26 #include "content/public/browser/web_contents.h"
27 #include "content/public/browser/web_ui.h" 27 #include "content/public/browser/web_ui.h"
28 #include "content/public/browser/web_ui_data_source.h" 28 #include "content/public/browser/web_ui_data_source.h"
29 #include "grit/settings_resources.h" 29 #include "grit/settings_resources.h"
30 #include "grit/settings_resources_map.h" 30 #include "grit/settings_resources_map.h"
31 31
32 #if defined(OS_CHROMEOS) 32 #if defined(OS_CHROMEOS)
33 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 33 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
34 #include "chrome/browser/ui/webui/settings/chromeos/keyboard_handler.h"
34 #else // !defined(OS_CHROMEOS) 35 #else // !defined(OS_CHROMEOS)
35 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 36 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
36 #endif // defined(OS_CHROMEOS) 37 #endif // defined(OS_CHROMEOS)
37 38
38 namespace settings { 39 namespace settings {
39 40
40 SettingsPageUIHandler::SettingsPageUIHandler() { 41 SettingsPageUIHandler::SettingsPageUIHandler() {
41 } 42 }
42 43
43 SettingsPageUIHandler::~SettingsPageUIHandler() { 44 SettingsPageUIHandler::~SettingsPageUIHandler() {
(...skipping 15 matching lines...) Expand all
59 AddSettingsPageUIHandler(new DownloadsHandler()); 60 AddSettingsPageUIHandler(new DownloadsHandler());
60 AddSettingsPageUIHandler(new FontHandler(web_ui)); 61 AddSettingsPageUIHandler(new FontHandler(web_ui));
61 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 62 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
62 AddSettingsPageUIHandler(new PeopleHandler(profile)); 63 AddSettingsPageUIHandler(new PeopleHandler(profile));
63 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 64 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
64 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 65 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
65 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 66 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
66 67
67 #if defined(OS_CHROMEOS) 68 #if defined(OS_CHROMEOS)
68 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 69 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
70 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
69 #else 71 #else
70 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 72 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
71 #endif 73 #endif
72 74
73 content::WebUIDataSource* html_source = 75 content::WebUIDataSource* html_source =
74 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost); 76 content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
75 77
76 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 78 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
77 79
78 // Add all settings resources. 80 // Add all settings resources.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 114 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
113 base::Time::Now() - load_start_time_); 115 base::Time::Now() - load_start_time_);
114 } 116 }
115 117
116 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 118 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
117 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 119 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
118 base::Time::Now() - load_start_time_); 120 base::Time::Now() - load_start_time_);
119 } 121 }
120 122
121 } // namespace settings 123 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698