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

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

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Add listeners to options and settings Created 3 years, 10 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/ui/ash/ash_util.h" 51 #include "chrome/browser/ui/ash/ash_util.h"
52 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 52 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
53 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h" 53 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h"
54 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 54 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
55 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 55 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
56 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" 56 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
57 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 57 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
58 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 58 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
59 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h" 59 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h"
60 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" 60 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
61 #include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h"
61 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 62 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
62 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h" 63 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h"
63 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 64 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
64 #include "chrome/common/chrome_switches.h" 65 #include "chrome/common/chrome_switches.h"
65 #include "components/arc/arc_util.h" 66 #include "components/arc/arc_util.h"
66 #else // !defined(OS_CHROMEOS) 67 #else // !defined(OS_CHROMEOS)
67 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 68 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
68 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 69 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
69 #include "chrome/browser/ui/webui/settings/system_handler.h" 70 #include "chrome/browser/ui/webui/settings/system_handler.h"
70 #endif // defined(OS_CHROMEOS) 71 #endif // defined(OS_CHROMEOS)
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #if defined(OS_CHROMEOS) 150 #if defined(OS_CHROMEOS)
150 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 151 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
151 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 152 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
152 profile); 153 profile);
153 if (easy_unlock_handler) 154 if (easy_unlock_handler)
154 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler)); 155 AddSettingsPageUIHandler(base::WrapUnique(easy_unlock_handler));
155 156
156 AddSettingsPageUIHandler(base::WrapUnique( 157 AddSettingsPageUIHandler(base::WrapUnique(
157 chromeos::settings::DateTimeHandler::Create(html_source))); 158 chromeos::settings::DateTimeHandler::Create(html_source)));
158 159
159 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 160 AddSettingsPageUIHandler(
161 base::MakeUnique<chromeos::settings::StylusHandler>());
160 html_source->AddBoolean("pinUnlockEnabled", 162 html_source->AddBoolean("pinUnlockEnabled",
161 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); 163 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
162 html_source->AddBoolean("fingerprintUnlockEnabled", 164 html_source->AddBoolean("fingerprintUnlockEnabled",
163 chromeos::IsFingerprintUnlockEnabled()); 165 chromeos::IsFingerprintUnlockEnabled());
164 html_source->AddBoolean("androidAppsAllowed", 166 html_source->AddBoolean("androidAppsAllowed",
165 arc::IsArcAllowedForProfile(profile) && 167 arc::IsArcAllowedForProfile(profile) &&
166 !arc::IsArcOptInVerificationDisabled()); 168 !arc::IsArcOptInVerificationDisabled());
167 169
168 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348 170 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348
169 bool enable_power_settings = 171 bool enable_power_settings =
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 224 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
223 base::Time::Now() - load_start_time_); 225 base::Time::Now() - load_start_time_);
224 } 226 }
225 227
226 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 228 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
227 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 229 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
228 base::Time::Now() - load_start_time_); 230 base::Time::Now() - load_start_time_);
229 } 231 }
230 232
231 } // namespace settings 233 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698