User orientation lock

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/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
@@ skipping 15 matching lines @@
 namespace ash {
 
 namespace {
 
 bool IsMaximizeModeWindowManagerEnabled() {
   return Shell::Get()
       ->maximize_mode_controller()
       ->IsMaximizeModeWindowManagerEnabled();
 }
 
-bool IsRotationLocked() {
+bool IsUserRotationLocked() {
   return Shell::GetInstance()
       ->screen_orientation_controller()
-      ->rotation_locked();
+      ->user_rotation_locked();
 }
 
 }  // namespace
 
 namespace tray {
 
 class RotationLockDefaultView : public ActionableView,
                                 public ShellObserver,
                                 public ScreenOrientationController::Observer {
  public:
   explicit RotationLockDefaultView(SystemTrayItem* owner);
   ~RotationLockDefaultView() override;
 
  private:
   // Updates icon and label according to current rotation lock status.
   void Update();
 
   // Stop observing rotation lock status.
   void StopObservingRotation();
 
   // ActionableView:
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   bool PerformAction(const ui::Event& event) override;
 
   // ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   // ScreenOrientationController::Obsever:
-  void OnRotationLockChanged(bool rotation_locked) override;
+  void OnUserRotationLockChanged() override;
 
   views::ImageView* icon_;
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(RotationLockDefaultView);
 };
 
 RotationLockDefaultView::RotationLockDefaultView(SystemTrayItem* owner)
     : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS),
       icon_(TrayPopupUtils::CreateMainImageView()),
@@ skipping 17 matching lines @@
     Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
 }
 
 RotationLockDefaultView::~RotationLockDefaultView() {
   StopObservingRotation();
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void RotationLockDefaultView::Update() {
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
-  icon_->SetImage(gfx::CreateVectorIcon(IsRotationLocked()
+  icon_->SetImage(gfx::CreateVectorIcon(IsUserRotationLocked()
                                             ? kSystemMenuRotationLockLockedIcon
                                             : kSystemMenuRotationLockAutoIcon,
                                         kMenuIconSize, style.GetIconColor()));
 
   base::string16 label = l10n_util::GetStringUTF16(
-      IsRotationLocked() ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED
-                         : IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO);
+      IsUserRotationLocked() ? IDS_ASH_STATUS_TRAY_ROTATION_LOCK_LOCKED
+                             : IDS_ASH_STATUS_TRAY_ROTATION_LOCK_AUTO);
   label_->SetText(label);
   style.SetupLabel(label_);
 
   Layout();
   SchedulePaint();
 }
 
 void RotationLockDefaultView::StopObservingRotation() {
   ScreenOrientationController* controller =
       Shell::GetInstance()->screen_orientation_controller();
   if (controller)
     controller->RemoveObserver(this);
 }
 
 void RotationLockDefaultView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   ActionableView::GetAccessibleNodeData(node_data);
   if (!label_->text().empty())
     node_data->SetName(label_->text());
 }
 
 bool RotationLockDefaultView::PerformAction(const ui::Event& event) {
-  Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
-      !IsRotationLocked());
+  Shell::GetInstance()
+      ->screen_orientation_controller()
+      ->ToggleUserRotationLock();
   return true;
 }
 
 void RotationLockDefaultView::OnMaximizeModeStarted() {
   Update();
   SetVisible(true);
   Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
 }
 
 void RotationLockDefaultView::OnMaximizeModeEnded() {
   SetVisible(false);
   StopObservingRotation();
 }
 
-void RotationLockDefaultView::OnRotationLockChanged(bool rotation_locked) {
+void RotationLockDefaultView::OnUserRotationLockChanged() {
   Update();
 }
 
 }  // namespace tray
 
 TrayRotationLock::TrayRotationLock(SystemTray* system_tray)
     : TrayImageItem(system_tray,
                     kSystemTrayRotationLockLockedIcon,
                     UMA_ROTATION_LOCK) {
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 TrayRotationLock::~TrayRotationLock() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
-void TrayRotationLock::OnRotationLockChanged(bool rotation_locked) {
+void TrayRotationLock::OnUserRotationLockChanged() {
   tray_view()->SetVisible(ShouldBeVisible());
 }
 
 views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
   if (OnPrimaryDisplay())
     return new tray::RotationLockDefaultView(this);
   return nullptr;
 }
 
 void TrayRotationLock::OnMaximizeModeStarted() {
-  tray_view()->SetVisible(IsRotationLocked());
+  tray_view()->SetVisible(IsUserRotationLocked());
   Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
 }
 
 void TrayRotationLock::OnMaximizeModeEnded() {
   tray_view()->SetVisible(false);
   StopObservingRotation();
 }
 
 void TrayRotationLock::DestroyTrayView() {
   StopObservingRotation();
   Shell::GetInstance()->RemoveShellObserver(this);
   TrayImageItem::DestroyTrayView();
 }
 
 bool TrayRotationLock::GetInitialVisibility() {
   return ShouldBeVisible();
 }
 
 bool TrayRotationLock::ShouldBeVisible() {
   return OnPrimaryDisplay() && IsMaximizeModeWindowManagerEnabled() &&
-         IsRotationLocked();
+         IsUserRotationLocked();
 }
 
 bool TrayRotationLock::OnPrimaryDisplay() const {
   gfx::NativeView native_view = system_tray()->GetWidget()->GetNativeView();
   display::Display parent_display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(native_view);
   return parent_display.IsInternal();
 }
 
 void TrayRotationLock::StopObservingRotation() {
   ScreenOrientationController* controller =
       Shell::GetInstance()->screen_orientation_controller();
   if (controller)
     controller->RemoveObserver(this);
 }
 
 }  // namespace ash