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

Unified Diff: ash/display/screen_orientation_controller_chromeos.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge Created 3 years, 9 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 | « ash/common/wm_shell.cc ('k') | ash/display/shutdown_observer_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_orientation_controller_chromeos.cc
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc
index 90742cfbcf5c77cbbebd73ba2331f497ece1cb75..1d21455d03144547cd197229bb60447f3be8b06d 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -68,11 +68,11 @@ ScreenOrientationController::ScreenOrientationController()
rotation_locked_orientation_(blink::WebScreenOrientationLockAny),
user_rotation_(display::Display::ROTATE_0),
current_rotation_(display::Display::ROTATE_0) {
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
ScreenOrientationController::~ScreenOrientationController() {
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
WmShell::Get()->RemoveDisplayObserver(this);
Shell::GetInstance()->activation_client()->RemoveObserver(this);
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/display/shutdown_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698