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

Unified Diff: chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc

Issue 2644713002: cros: Use runtime stylus detection for ash palette. (Closed)
Patch Set: Fix test 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/options/chromeos/options_stylus_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc b/chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc
index 44d319ea98d591dc8a4dcee078867f1bc28344df..725a703b586abfbb000636be114cec1a7feaf148 100644
--- a/chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/options_stylus_handler.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/events/devices/input_device_manager.h"
namespace chromeos {
namespace options {
@@ -24,9 +25,11 @@ constexpr char kAppPreferredKey[] = "preferred";
OptionsStylusHandler::OptionsStylusHandler() : weak_ptr_factory_(this) {
NoteTakingHelper::Get()->AddObserver(this);
+ ui::InputDeviceManager::GetInstance()->AddObserver(this);
}
OptionsStylusHandler::~OptionsStylusHandler() {
+ ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
NoteTakingHelper::Get()->RemoveObserver(this);
}
@@ -60,9 +63,6 @@ void OptionsStylusHandler::GetLocalizedValues(
"stylusNoteTakingAppWaitingForAndroid",
l10n_util::GetStringUTF16(
IDS_OPTIONS_STYLUS_NOTE_TAKING_APP_WAITING_FOR_ANDROID));
-
- localized_strings->SetBoolean("showStylusSettings",
- ash::IsPaletteFeatureEnabled());
}
void OptionsStylusHandler::InitializePage() {
@@ -74,12 +74,34 @@ void OptionsStylusHandler::RegisterMessages() {
"setPreferredNoteTakingApp",
base::Bind(&OptionsStylusHandler::SetPreferredNoteTakingApp,
weak_ptr_factory_.GetWeakPtr()));
+ web_ui()->RegisterMessageCallback(
+ "requestStylusHardwareState",
+ base::Bind(&OptionsStylusHandler::RequestStylusHardwareState,
+ weak_ptr_factory_.GetWeakPtr()));
}
void OptionsStylusHandler::OnAvailableNoteTakingAppsUpdated() {
UpdateNoteTakingApps();
}
+void OptionsStylusHandler::OnDeviceListsComplete() {
+ SendHasStylus();
+}
+
+void OptionsStylusHandler::RequestStylusHardwareState(
+ const base::ListValue* args) {
+ if (ui::InputDeviceManager::GetInstance()->AreDeviceListsComplete())
+ SendHasStylus();
+}
+
+void OptionsStylusHandler::SendHasStylus() {
+ DCHECK(ui::InputDeviceManager::GetInstance()->AreDeviceListsComplete());
+
+ web_ui()->CallJavascriptFunctionUnsafe(
+ "BrowserOptions.setStylusInputStatus",
+ base::FundamentalValue(ash::palette_utils::HasStylusInput()));
+}
+
void OptionsStylusHandler::UpdateNoteTakingApps() {
bool waiting_for_android = false;
note_taking_app_ids_.clear();

Powered by Google App Engine
This is Rietveld 408576698