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

Unified Diff: ash/system/chromeos/power/tablet_power_button_controller.h

Issue 2579703003: Using ShellObserver instead of creating MaximizeModeController::Observer (Closed)
Patch Set: Created 4 years 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: ash/system/chromeos/power/tablet_power_button_controller.h
diff --git a/ash/system/chromeos/power/tablet_power_button_controller.h b/ash/system/chromeos/power/tablet_power_button_controller.h
index a6239f693dc6ad68af73310f18547a4ae0dcb24b..b99148efaab18721db5814830f3ef9200d35a7c5 100644
--- a/ash/system/chromeos/power/tablet_power_button_controller.h
+++ b/ash/system/chromeos/power/tablet_power_button_controller.h
@@ -8,7 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
-#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/shell_observer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/tick_clock.h"
@@ -26,7 +26,7 @@ class LockStateController;
// instantiated and used in PowerButtonController.
class ASH_EXPORT TabletPowerButtonController
: public chromeos::PowerManagerClient::Observer,
- public MaximizeModeController::Observer,
+ public ShellObserver,
public ui::EventHandler,
public ui::InputDeviceEventObserver {
public:
@@ -63,9 +63,9 @@ class ASH_EXPORT TabletPowerButtonController
void BrightnessChanged(int level, bool user_initiated) override;
void SuspendDone(const base::TimeDelta& sleep_duration) override;
- // Overridden from MaximizeModeController::Observer:
- void OnEnterMaximizeMode() override;
- void OnLeaveMaximizeMode() override;
+ // Overridden from ShellObserver:
+ void OnMaximizeModeStarted() override;
+ void OnMaximizeModeEnded() override;
// Overridden from ui::EventHandler:
void OnKeyEvent(ui::KeyEvent* event) override;
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_controller.cc ('k') | ash/system/chromeos/power/tablet_power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698