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

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

Issue 2110833003: MD Settings: Add mouse settings, update pointer settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PointersFake
Patch Set: Created 4 years, 5 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 18 matching lines...) Expand all
29 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
30 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
31 #include "content/public/browser/web_ui.h" 31 #include "content/public/browser/web_ui.h"
32 #include "content/public/browser/web_ui_data_source.h" 32 #include "content/public/browser/web_ui_data_source.h"
33 #include "grit/settings_resources.h" 33 #include "grit/settings_resources.h"
34 #include "grit/settings_resources_map.h" 34 #include "grit/settings_resources_map.h"
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
37 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 37 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
38 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 38 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
39 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
39 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 40 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
40 #else // !defined(OS_CHROMEOS) 41 #else // !defined(OS_CHROMEOS)
41 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 42 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
42 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 43 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
43 #include "chrome/browser/ui/webui/settings/system_handler.h" 44 #include "chrome/browser/ui/webui/settings/system_handler.h"
44 #endif // defined(OS_CHROMEOS) 45 #endif // defined(OS_CHROMEOS)
45 46
46 #if defined(USE_NSS_CERTS) 47 #if defined(USE_NSS_CERTS)
47 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 48 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
48 #elif defined(OS_WIN) || defined(OS_MACOSX) 49 #elif defined(OS_WIN) || defined(OS_MACOSX)
(...skipping 22 matching lines...) Expand all
71 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile)); 72 AddSettingsPageUIHandler(new MediaDevicesSelectionHandler(profile));
72 AddSettingsPageUIHandler(new PeopleHandler(profile)); 73 AddSettingsPageUIHandler(new PeopleHandler(profile));
73 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); 74 AddSettingsPageUIHandler(new ProfileInfoHandler(profile));
74 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); 75 AddSettingsPageUIHandler(new SearchEnginesHandler(profile));
75 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); 76 AddSettingsPageUIHandler(new SiteSettingsHandler(profile));
76 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); 77 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui));
77 78
78 #if defined(OS_CHROMEOS) 79 #if defined(OS_CHROMEOS)
79 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); 80 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
80 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); 81 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
82 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler());
81 #else 83 #else
82 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); 84 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
83 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); 85 AddSettingsPageUIHandler(new ManageProfileHandler(profile));
84 AddSettingsPageUIHandler(new SystemHandler()); 86 AddSettingsPageUIHandler(new SystemHandler());
85 #endif 87 #endif
86 88
87 // Host must be derived from the visible URL, since this might be serving 89 // Host must be derived from the visible URL, since this might be serving
88 // either chrome://settings or chrome://md-settings. 90 // either chrome://settings or chrome://md-settings.
89 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() || 91 CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
90 url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin()); 92 url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 140 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
139 base::Time::Now() - load_start_time_); 141 base::Time::Now() - load_start_time_);
140 } 142 }
141 143
142 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 144 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
143 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 145 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
144 base::Time::Now() - load_start_time_); 146 base::Time::Now() - load_start_time_);
145 } 147 }
146 148
147 } // namespace settings 149 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698