Lock Rotation on user settings changes

ash/system/chromeos/rotation/tray_rotation_lock.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 38 matching lines @@
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 RotationLockDefaultView::~RotationLockDefaultView() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 bool RotationLockDefaultView::PerformAction(const ui::Event& event) {
   MaximizeModeController* maximize_mode_controller = Shell::GetInstance()->
       maximize_mode_controller();
-  bool rotation_locked = !maximize_mode_controller->rotation_locked();
-  maximize_mode_controller->set_rotation_locked(rotation_locked);
-
+  maximize_mode_controller->SetRotationLocked(
+      !maximize_mode_controller->rotation_locked());
   UpdateImage();
-
-  // RotationLockDefaultView can only be created by a TrayRotationLock. The
-  // owner needs to be told of the action so that it can update its visibility.
-  static_cast<TrayRotationLock*>(owner())->tray_view()->
-      SetVisible(rotation_locked);
-
   return true;
 }
 
 void RotationLockDefaultView::OnMaximizeModeStarted() {
   UpdateImage();
   SetVisible(true);
 }
 
 void RotationLockDefaultView::OnMaximizeModeEnded() {
   SetVisible(false);
@@ skipping 30 matching lines @@
 
   if (on_primary_display_)
     Shell::GetInstance()->AddShellObserver(this);
 }
 
 TrayRotationLock::~TrayRotationLock() {
   if (on_primary_display_)
     Shell::GetInstance()->RemoveShellObserver(this);
 }
 
+void TrayRotationLock::OnRotationLockChanged(bool rotation_locked) {
+  tray_view()->SetVisible(ShouldBeVisible());
+}
+
 views::View* TrayRotationLock::CreateDefaultView(user::LoginStatus status) {
   if (on_primary_display_)
     return new tray::RotationLockDefaultView(this);
   return NULL;
 }
 
 void TrayRotationLock::OnMaximizeModeStarted() {
   tray_view()->SetVisible(
       Shell::GetInstance()->maximize_mode_controller()->rotation_locked());
+  Shell::GetInstance()->maximize_mode_controller()->AddObserver(this);
 }
 
 void TrayRotationLock::OnMaximizeModeEnded() {
   tray_view()->SetVisible(false);
+  Shell::GetInstance()->maximize_mode_controller()->RemoveObserver(this);
 }
 
 bool TrayRotationLock::GetInitialVisibility() {
+  return ShouldBeVisible();
+}
+
+bool TrayRotationLock::ShouldBeVisible() {
   MaximizeModeController* controller = Shell::GetInstance()->
       maximize_mode_controller();
   return on_primary_display_ &&
          controller->IsMaximizeModeWindowManagerEnabled() &&
          controller->rotation_locked();
 }
 
 }  // namespace ash