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

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

Powered by Google App Engine
This is Rietveld 408576698