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

Unified Diff: chrome/browser/ui/ash/palette_delegate_chromeos.h

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
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/palette_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/palette_delegate_chromeos.h b/chrome/browser/ui/ash/palette_delegate_chromeos.h
index 95acad8949a5d07ffe99b23e43c48c64d0a51271..07bed63f77cf8e47555bba67812d126abf68cca8 100644
--- a/chrome/browser/ui/ash/palette_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/palette_delegate_chromeos.h
@@ -15,7 +15,6 @@
#include "base/values.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
-#include "ui/events/devices/input_device_event_observer.h"
class PrefChangeRegistrar;
class Profile;
@@ -28,26 +27,18 @@ namespace chromeos {
// A class which allows the Ash palette to perform chrome actions.
class PaletteDelegateChromeOS : public ash::PaletteDelegate,
- public ui::InputDeviceEventObserver,
public ash::SessionStateObserver,
public content::NotificationObserver {
public:
- // Attempts to create a palette delegate. This will return null if the palette
- // feature is not enabled.
- static std::unique_ptr<PaletteDelegateChromeOS> Create();
-
+ PaletteDelegateChromeOS();
~PaletteDelegateChromeOS() override;
private:
- PaletteDelegateChromeOS();
-
// ash::PaletteDelegate:
std::unique_ptr<EnableListenerSubscription> AddPaletteEnableListener(
const EnableListener& on_state_changed) override;
void CreateNote() override;
bool HasNoteApp() override;
- void SetStylusStateChangedCallback(
- const OnStylusStateChangedCallback& on_stylus_state_changed) override;
bool ShouldAutoOpenPalette() override;
bool ShouldShowPalette() override;
void TakeScreenshot() override;
@@ -62,9 +53,6 @@ class PaletteDelegateChromeOS : public ash::PaletteDelegate,
const content::NotificationSource& source,
const content::NotificationDetails& details) override;
- // ui::InputDeviceObserver:
- void OnStylusStateChanged(ui::StylusState state) override;
-
// Called when the palette enabled pref has changed.
void OnPaletteEnabledPrefChanged();
@@ -72,7 +60,6 @@ class PaletteDelegateChromeOS : public ash::PaletteDelegate,
void OnPartialScreenshotDone(const base::Closure& then);
base::CallbackList<void(bool)> palette_enabled_callback_list_;
- OnStylusStateChangedCallback on_stylus_state_changed_;
// Unowned pointer to the active profile.
Profile* profile_ = nullptr;
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698