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

Unified Diff: ash/common/wm/maximize_mode/maximize_mode_controller.cc

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/common/wm/maximize_mode/maximize_mode_controller.cc
diff --git a/ash/common/wm/maximize_mode/maximize_mode_controller.cc b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
index 30ed246fee72fa76e42c3fe4ad735a99937fde01..6901481c6edd6f9ace32ee383a1321e0087160dd 100644
--- a/ash/common/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
@@ -133,14 +133,6 @@ MaximizeModeController::~MaximizeModeController() {
#endif // OS_CHROMEOS
}
-void MaximizeModeController::AddObserver(Observer* observer) {
- observers_.AddObserver(observer);
-}
-
-void MaximizeModeController::RemoveObserver(Observer* observer) {
- observers_.RemoveObserver(observer);
-}
-
bool MaximizeModeController::CanEnterMaximizeMode() {
// If we have ever seen accelerometer data, then HandleHingeRotation may
// trigger maximize mode at some point in the future.
@@ -172,7 +164,7 @@ void MaximizeModeController::EnableMaximizeModeWindowManager(
shell->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_ENABLED);
shell->OnMaximizeModeStarted();
- touchview_observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
+ observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
observer->OnTouchViewToggled(true);
});
@@ -181,7 +173,7 @@ void MaximizeModeController::EnableMaximizeModeWindowManager(
shell->RecordUserMetricsAction(UMA_MAXIMIZE_MODE_DISABLED);
shell->OnMaximizeModeEnded();
- touchview_observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
+ observers_.ForAllPtrs([](mojom::TouchViewObserver* observer) {
observer->OnTouchViewToggled(false);
});
}
@@ -349,9 +341,6 @@ void MaximizeModeController::EnterMaximizeMode() {
if (IsMaximizeModeWindowManagerEnabled())
return;
EnableMaximizeModeWindowManager(true);
-
- for (auto& observer : observers_)
- observer.OnEnterMaximizeMode();
}
void MaximizeModeController::LeaveMaximizeMode() {
@@ -367,9 +356,6 @@ void MaximizeModeController::LeaveMaximizeMode() {
if (!IsMaximizeModeWindowManagerEnabled())
return;
EnableMaximizeModeWindowManager(false);
-
- for (auto& observer : observers_)
- observer.OnLeaveMaximizeMode();
}
// Called after maximize mode has started, windows might still animate though.
@@ -421,7 +407,7 @@ MaximizeModeController::CurrentTouchViewIntervalType() {
void MaximizeModeController::AddObserver(mojom::TouchViewObserverPtr observer) {
observer->OnTouchViewToggled(IsMaximizeModeWindowManagerEnabled());
- touchview_observers_.AddPtr(std::move(observer));
+ observers_.AddPtr(std::move(observer));
}
void MaximizeModeController::OnAppTerminating() {
« no previous file with comments | « ash/common/wm/maximize_mode/maximize_mode_controller.h ('k') | ash/system/chromeos/power/tablet_power_button_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698