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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/settings/md_settings_ui.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
index 0965328a12d90f76a1bac1d1aa5fc84197ca724b..15b7d2cf9f99cc6dc10eeb0d81af0f473f0ec043 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
@@ -58,6 +58,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
+#include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h"
#include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
@@ -156,7 +157,8 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui, const GURL& url)
AddSettingsPageUIHandler(base::WrapUnique(
chromeos::settings::DateTimeHandler::Create(html_source)));
- html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
+ AddSettingsPageUIHandler(
+ base::MakeUnique<chromeos::settings::StylusHandler>());
html_source->AddBoolean("pinUnlockEnabled",
chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
html_source->AddBoolean("fingerprintUnlockEnabled",

Powered by Google App Engine
This is Rietveld 408576698