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

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

Issue 2200463002: Reorganize accessibility settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address last feedback from dbeam Created 4 years, 4 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 20 matching lines...) Expand all
31 #include "chrome/common/url_constants.h" 31 #include "chrome/common/url_constants.h"
32 #include "content/public/browser/web_contents.h" 32 #include "content/public/browser/web_contents.h"
33 #include "content/public/browser/web_ui.h" 33 #include "content/public/browser/web_ui.h"
34 #include "content/public/browser/web_ui_data_source.h" 34 #include "content/public/browser/web_ui_data_source.h"
35 #include "grit/settings_resources.h" 35 #include "grit/settings_resources.h"
36 #include "grit/settings_resources_map.h" 36 #include "grit/settings_resources_map.h"
37 37
38 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
39 #include "ash/common/system/chromeos/palette/palette_utils.h" 39 #include "ash/common/system/chromeos/palette/palette_utils.h"
40 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 40 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
41 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
41 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 42 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
42 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 43 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
43 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 44 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
44 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 45 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
45 #else // !defined(OS_CHROMEOS) 46 #else // !defined(OS_CHROMEOS)
46 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 47 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
47 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 48 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
48 #include "chrome/browser/ui/webui/settings/system_handler.h" 49 #include "chrome/browser/ui/webui/settings/system_handler.h"
49 #endif // defined(OS_CHROMEOS) 50 #endif // defined(OS_CHROMEOS)
50 51
(...skipping 25 matching lines...) Expand all
76 AddSettingsPageUIHandler(new ProtocolHandlersHandler()); 77 AddSettingsPageUIHandler(new ProtocolHandlersHandler());
77 AddSettingsPageUIHandler(new LanguagesHandler(web_ui)); 78 AddSettingsPageUIHandler(new LanguagesHandler(web_ui));
78 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile)); 79 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile));
79 AddSettingsPageUIHandler(new PeopleHandler(profile)); 80 AddSettingsPageUIHandler(new PeopleHandler(profile));
80 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); 81 AddSettingsPageUIHandler(new ProfileInfoHandler(profile));
81 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 82 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
82 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 83 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
83 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 84 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
84 85
85 #if defined(OS_CHROMEOS) 86 #if defined(OS_CHROMEOS)
87 AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler(
88 web_ui));
86 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 89 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
87 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 90 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
88 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler()); 91 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler());
89 #else 92 #else
90 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 93 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
91 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 94 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
92 AddSettingsPageUIHandler(new SystemHandler()); 95 AddSettingsPageUIHandler(new SystemHandler());
93 #endif 96 #endif
94 97
95 // Host must be derived from the visible URL, since this might be serving 98 // Host must be derived from the visible URL, since this might be serving
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 153 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
151 base::Time::Now() - load_start_time_); 154 base::Time::Now() - load_start_time_);
152 } 155 }
153 156
154 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 157 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
155 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 158 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
156 base::Time::Now() - load_start_time_); 159 base::Time::Now() - load_start_time_);
157 } 160 }
158 161
159 } // namespace settings 162 } // 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