chrome/browser/ui/webui/settings/md_settings_ui.cc - Issue 2686383002: cros: Use runtime stylus detection for ash palette.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2686383002: cros: Use runtime stylus detection for ash palette. (Closed)

Patch Set: 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:

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 910ca3bc68df03d4e643bdd600e82e9953106d0e..471bc249d55b571aa4daa46b8db6f4abec0440a5 100644

--- a/chrome/browser/ui/webui/settings/md_settings_ui.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc

@@ -57,6 +57,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/internet_handler.h"

#include "chrome/common/chrome_switches.h"

@@ -150,7 +151,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(