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

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