mash: Migrate ShelfLockingManager to ash/common.

ash/common/wm_shell.h

 // Copyright 2016 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_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/common/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
 
 namespace views {
 class PointerDownWatcher;
 }
 
 namespace ash {
 
 class AccessibilityDelegate;
 class BrightnessControlDelegate;
@@ skipping 192 matching lines @@
 
   virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0;
   virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0;
 
   void AddShellObserver(ShellObserver* observer);
   void RemoveShellObserver(ShellObserver* observer);
 
   virtual void AddPointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
   virtual void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
 
+  // TODO: Move these back to LockStateController when that has been moved.

[James Cook, 2016/07/20 21:14:30]

nit: TODO(someone) -- the linter barfs on todo formats :-(

[msw, 2016/07/20 21:21:14]

Eh, I'm okay with lint warnings here, unless you object further. Claiming
responsibility for every TODO in this migration project isn't entirely
reasonable; I expect some might hang out longer than we'll hope. Neither of us
have signed up to convert LockStateController, so it doesn't seem obligatory to
stamp my name on this followup task.

[James Cook, 2016/07/20 21:23:24]

Sure, leave it as-is, especially since you have green try runs.

In the future, maybe we should just use TODO(mustash) or something, following
https://google.github.io/styleguide/cppguide.html#TODO_Comments

+  void OnLockStateEvent(LockStateObserver::EventType event);
+  void AddLockStateObserver(LockStateObserver* observer);
+  void RemoveLockStateObserver(LockStateObserver* observer);
+
 #if defined(OS_CHROMEOS)
   LogoutConfirmationController* logout_confirmation_controller() {
     return logout_confirmation_controller_.get();
   }
 
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 #endif
 
  protected:
@@ skipping 37 matching lines @@
       keyboard_brightness_control_delegate_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<MaximizeModeController> maximize_mode_controller_;
   std::unique_ptr<MediaDelegate> media_delegate_;
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowCycleController> window_cycle_controller_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;
 
+  base::ObserverList<LockStateObserver> lock_state_observers_;
+
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_