Add device policy to disallow shutdown - ash UI modifications

chrome/browser/ui/ash/system_tray_delegate_chromeos.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 CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
 #include <vector>
 
 #include "ash/session/session_state_observer.h"
 #include "ash/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
+#include "chrome/browser/ui/webui/chromeos/login/shutdown_policy_observer.h"

[Daniel Erat, 2014/12/17 16:21:04]

it seems strange to me for this file to depend on a file in a webui directory
for doing non-webui things. should the webui file be moved somewhere else if
it's being used more generally?

[stevenjb, 2014/12/17 19:09:03]

+1. shutdown_policy_observer.h should probably be moved to
chrome/browser/chromeos/settings.

[cschuet (SLOW), 2015/01/07 14:37:07]

Done.

[cschuet (SLOW), 2015/01/07 14:37:07]

Done.

 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace user_manager {
 class User;
 }
 
 namespace chromeos {
-
 class SystemTrayDelegateChromeOS
     : public ui::ime::InputMethodMenuManager::Observer,
       public ash::SystemTrayDelegate,
       public SessionManagerClient::Observer,
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
       public chromeos::LoginState::Observer,
       public chromeos::CrasAudioHandler::AudioObserver,
       public device::BluetoothAdapter::Observer,
       public policy::CloudPolicyStore::Observer,
       public ash::SessionStateObserver,
       public chrome::BrowserListObserver,
       public extensions::AppWindowRegistry::Observer,
       public user_manager::UserManager::UserSessionStateObserver,
-      public SupervisedUserServiceObserver {
+      public SupervisedUserServiceObserver,
+      public ShutdownPolicyObserver::Delegate {
  public:
   SystemTrayDelegateChromeOS();
 
   ~SystemTrayDelegateChromeOS() override;
 
   void InitializeOnAdapterReady(
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Overridden from ash::SystemTrayDelegate:
   void Initialize() override;
@@ skipping 19 matching lines @@
   void ShowChromeSlow() override;
   bool ShouldShowDisplayNotification() override;
   void ShowIMESettings() override;
   void ShowHelp() override;
   void ShowAccessibilityHelp() override;
   void ShowAccessibilitySettings() override;
   void ShowPublicAccountInfo() override;
   void ShowSupervisedUserInfo() override;
   void ShowEnterpriseInfo() override;
   void ShowUserLogin() override;
+  void Restart() override;
   void ShutDown() override;
   void SignOut() override;
   void RequestLockScreen() override;
   void RequestRestartForUpdate() override;
   void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override;
   void BluetoothStartDiscovering() override;
   void BluetoothStopDiscovering() override;
   void ConnectToBluetoothDevice(const std::string& address) override;
   bool IsBluetoothDiscovering() override;
   void GetCurrentIME(ash::IMEInfo* info) override;
@@ skipping 15 matching lines @@
   bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
   int GetSystemTrayMenuWidth() override;
   void ActiveUserWasChanged() override;
   bool IsSearchKeyMappedToCapsLock() override;
   ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
       const std::string& user_id) override;
   void AddCustodianInfoTrayObserver(
       ash::CustodianInfoTrayObserver* observer) override;
   void RemoveCustodianInfoTrayObserver(
       ash::CustodianInfoTrayObserver* observer) override;
+  void AddShutdownPolicyObserver(
+      ash::ShutdownPolicyObserver* observer) override;
+  void ShouldRebootOnShutdown(
+      const ash::RebootOnShutdownCallback& callback) override;
+  void RemoveShutdownPolicyObserver(
+      ash::ShutdownPolicyObserver* observer) override;
 
   // Overridden from user_manager::UserManager::UserSessionStateObserver:
   void UserAddedToSession(const user_manager::User* active_user) override;
 
   void UserChangedChildStatus(user_manager::User* user) override;
 
   // browser tests need to call ShouldUse24HourClock().
   bool GetShouldUse24HourClockForTesting() const;
 
  private:
@@ skipping 98 matching lines @@
 
   // Overridden from extensions::AppWindowRegistry::Observer:
   void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
 
   // Overridden from SupervisedUserServiceObserver:
   void OnCustodianInfoChanged() override;
 
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
+  // Overridden from ShutdownPolicyObserver::Delegate.
+  void OnShutdownPolicyChanged(bool reboot_on_shutdown) override;
+
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
   scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
   Profile* user_profile_;
   base::HourClockType clock_type_;
   int search_key_mapped_to_;
   bool screen_locked_;
   bool have_session_start_time_;
   base::TimeTicks session_start_time_;
   bool have_session_length_limit_;
   base::TimeDelta session_length_limit_;
   std::string enterprise_domain_;
   bool should_run_bluetooth_discovery_;
   bool session_started_;
 
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
   scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
   scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
   base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
       accounts_delegates_;
+  scoped_ptr<ShutdownPolicyObserver> shutdown_policy_observer_;

[Daniel Erat, 2014/12/17 16:21:04]

please improve the naming here. it's confusing to have both a concrete
chromeos::ShutdownPolicyObserver class and an ash::ShutdownPolicyObserver
interface that are unrelated inheritance-wise, and then have both
shutdown_policy_observer_ and shutdown_policy_observers_ members here.

i'd recommend renaming the non-ash class to something like
ShutdownPolicyWatcher. maybe someone else can come up with a better name, but it
doesn't seem like a non-interface should be called "Observer".

[stevenjb, 2014/12/17 19:09:02]

+1, I suggest the following:
* The existing ShutdownPolicyObserver should be renamed, either
ShutdownPolicyWatcher, or I might recommend ShutdownPolicyHandler.
* The new class should maybe be ShutdownPolicySettingObserver just to be extra
clear and avoid confusing git.

[cschuet (SLOW), 2015/01/07 14:37:07]

Done.

[cschuet (SLOW), 2015/01/07 14:37:07]

Done.

 
   ObserverList<ash::CustodianInfoTrayObserver>
       custodian_info_changed_observers_;
 
+  ObserverList<ash::ShutdownPolicyObserver, true> shutdown_policy_observers_;
+
   base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_