Add device policy to disallow shutdown - ash UI modifications

ash/wm/lock_state_controller.h

 // Copyright 2013 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.
 
 #ifndef ASH_WM_LOCK_STATE_CONTROLLER_H_
 #define ASH_WM_LOCK_STATE_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/lock_state_observer.h"
@@ skipping 22 matching lines @@
 class PowerButtonControllerTest;
 }
 
 // Performs system-related functions on behalf of LockStateController.
 class ASH_EXPORT LockStateControllerDelegate {
  public:
   LockStateControllerDelegate() {}
   virtual ~LockStateControllerDelegate() {}
 
   virtual void RequestLockScreen() = 0;
-  virtual void RequestRestart() = 0;
-  virtual void RequestShutdown() = 0;
+  virtual void RequestShutdownOrRestart() = 0;

[Daniel Erat, 2015/01/07 16:18:40]

sorry for all the conflicting messages you're getting here, but i'd prefer that
this method were just named "RequestShutdown". the force-reboot policy seems
like an edge case / implementation detail that callers shouldn't need to think
about.

[stevenjb, 2015/01/07 19:03:36]

Agreed.

[cschuet (SLOW), 2015/01/13 10:38:28]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(LockStateControllerDelegate);
 };
 
 // Displays onscreen animations and locks or suspends the system in response to
 // the power button being pressed or released.
 // Lock workflow:
 // Entry points:
 //  * StartLockAnimation (bool shutdown after lock) - starts lock that can be
@@ skipping 11 matching lines @@
 //
 // Unlock workflow:
 // WebUI does first part of animation, and calls OnLockScreenHide(callback) that
 // triggers StartUnlockAnimationBeforeUIDestroyed(callback). Once callback is
 // called at the end of the animation, lock UI is deleted, system unlocks, and
 // OnLockStateChanged is called. It leads to
 // StartUnlockAnimationAfterUIDestroyed.
 class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
                                        public ShellObserver {
  public:
-  // ShutdownMode determines whether the device will power off or reboot when
-  // RequestShutdown is invoked.
-  enum ShutdownMode { POWER_OFF, RESTART };
-
   // Amount of time that the power button needs to be held before we lock the
   // screen.
   static const int kLockTimeoutMs;
 
   // Amount of time that the power button needs to be held before we shut down.
   static const int kShutdownTimeoutMs;
 
   // Amount of time to wait for our lock requests to be honored before giving
   // up.
   static const int kLockFailTimeoutMs;
@@ skipping 40 matching lines @@
     }
     void trigger_lock_to_shutdown_timeout() {
       controller_->OnLockToShutdownTimeout();
       controller_->lock_to_shutdown_timer_.Stop();
     }
     void trigger_shutdown_timeout() {
       controller_->OnPreShutdownAnimationTimeout();
       controller_->pre_shutdown_timer_.Stop();
     }
     void trigger_real_shutdown_timeout() {
-      controller_->OnRealPowerTimeout(POWER_OFF);
+      controller_->OnRealPowerTimeout();
       controller_->real_shutdown_timer_.Stop();
     }
 
    private:
     LockStateController* controller_;  // not owned
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
   LockStateController();
@@ skipping 34 matching lines @@
 
   // Returns true if we are within cancellable shutdown timeframe.
   bool CanCancelShutdownAnimation();
 
   // Cancels shutting down and reverts shutdown animation.
   void CancelShutdownAnimation();
 
   // Called when Chrome gets a request to display the lock screen.
   void OnStartingLock();
 
-  // Displays the shutdown animation and requests shutdown when it's done.
-  void RequestShutdown(ShutdownMode mode);
+  // Displays the shutdown animation and requests a system shutdown or system
+  // restart depending on the the state of the |RebootOnShutdown| device policy.
+  void RequestShutdownOrRestart();

[Daniel Erat, 2015/01/07 16:18:40]

i think that this would be better as "RequestShutdown" as well

[cschuet (SLOW), 2015/01/13 10:38:28]

Done.

 
   // Called when ScreenLocker is ready to close, but not yet destroyed.
   // Can be used to display "hiding" animations on unlock.
   // |callback| will be called when all animations are done.
   void OnLockScreenHide(base::Closure& callback);
 
   // Sets up the callback that should be called once lock animation is finished.
   // Callback is guaranteed to be called once and then discarded.
   void SetLockScreenDisplayedCallback(const base::Closure& callback);
 
@@ skipping 28 matching lines @@
 
   // Starts timer for undoable shutdown animation.
   void StartPreShutdownAnimationTimer();
 
   // Calls StartRealShutdownTimer().
   void OnPreShutdownAnimationTimeout();
 
   // Starts timer for final shutdown animation.
   // If |with_animation_time| is true, it will also include time of "fade to
   // white" shutdown animation.
-  // If |shutdown_mode| is set to RESTART, the device will reboot.
-  void StartRealShutdownTimer(bool with_animation_time,
-                              ShutdownMode shutdown_mode);
+  void StartRealShutdownTimer(bool with_animation_time);
 
-  // Request that the machine be either restarted or shut down depending on
-  // |shutdown_mode|.
-  void OnRealPowerTimeout(ShutdownMode shutdown_mode);
+  // Request that the machine is shut down.

[Daniel Erat, 2015/01/07 16:18:40]

nit: s/is/be/

[cschuet (SLOW), 2015/01/13 10:38:28]

Done.

+  void OnRealPowerTimeout();
 
   // Starts shutdown animation that can be cancelled and starts pre-shutdown
   // timer.
   void StartCancellableShutdownAnimation();
 
   // If |request_lock_on_completion| is true, a lock request will be sent
   // after the pre-lock animation completes.  (The pre-lock animation is
   // also displayed in response to already-in-progress lock requests; in
   // these cases an additional lock request is undesirable.)
   void StartImmediatePreLockAnimation(bool request_lock_on_completion);
@@ skipping 72 matching lines @@
   base::Closure lock_screen_displayed_callback_;
 
   base::WeakPtrFactory<LockStateController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LockStateController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_LOCK_STATE_CONTROLLER_H_