| Index: chrome/browser/ui/ash/palette_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/palette_delegate_chromeos.cc b/chrome/browser/ui/ash/palette_delegate_chromeos.cc
|
| index 7c923d6f3d1b574124cb2fa4406768d080155591..cc6db0d86cbcae37adf71c554c29ba8b4798de83 100644
|
| --- a/chrome/browser/ui/ash/palette_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/palette_delegate_chromeos.cc
|
| @@ -21,29 +21,17 @@
|
| #include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_source.h"
|
| -#include "ui/events/devices/input_device_manager.h"
|
|
|
| namespace chromeos {
|
|
|
| -// static
|
| -std::unique_ptr<PaletteDelegateChromeOS> PaletteDelegateChromeOS::Create() {
|
| - if (!ash::IsPaletteFeatureEnabled())
|
| - return nullptr;
|
| - return base::WrapUnique(new PaletteDelegateChromeOS());
|
| -}
|
| -
|
| PaletteDelegateChromeOS::PaletteDelegateChromeOS() : weak_factory_(this) {
|
| registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
|
| content::NotificationService::AllSources());
|
| registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
|
| content::NotificationService::AllSources());
|
| -
|
| - ui::InputDeviceManager::GetInstance()->AddObserver(this);
|
| }
|
|
|
| -PaletteDelegateChromeOS::~PaletteDelegateChromeOS() {
|
| - ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
|
| -}
|
| +PaletteDelegateChromeOS::~PaletteDelegateChromeOS() {}
|
|
|
| std::unique_ptr<PaletteDelegateChromeOS::EnableListenerSubscription>
|
| PaletteDelegateChromeOS::AddPaletteEnableListener(
|
| @@ -131,11 +119,6 @@ void PaletteDelegateChromeOS::OnPartialScreenshotDone(
|
| then.Run();
|
| }
|
|
|
| -void PaletteDelegateChromeOS::SetStylusStateChangedCallback(
|
| - const OnStylusStateChangedCallback& on_stylus_state_changed) {
|
| - on_stylus_state_changed_ = on_stylus_state_changed;
|
| -}
|
| -
|
| bool PaletteDelegateChromeOS::ShouldAutoOpenPalette() {
|
| if (!profile_)
|
| return false;
|
| @@ -176,7 +159,4 @@ void PaletteDelegateChromeOS::CancelPartialScreenshot() {
|
| ash::Shell::GetInstance()->screenshot_controller()->CancelScreenshotSession();
|
| }
|
|
|
| -void PaletteDelegateChromeOS::OnStylusStateChanged(ui::StylusState state) {
|
| - on_stylus_state_changed_.Run(state);
|
| -}
|
| } // namespace chromeos
|
|
|