Rename SessionStateController -> LockStateController.
Now that we have SessionStateDelegate which covers more aspects of the session than just lock/unlock/shut down animations makes sense to rename lock animation related classes.
SessionStateController -> LockStateController
SessionStateControllerImpl2 > LockStateControllerImpl2
SessionStateObserver > LockStateObserver
SessionStateObserver will be used as observer for SessionStateDelegate for things like active user changed etc.
NOT renaming SessionStateControllerImpl since it is a legacy implementation and will removed soon.
BUG=180903
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/15974008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203193 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 7d05c1b..2cae8ab 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -386,6 +386,11 @@
'wm/gestures/two_finger_drag_handler.h',
'wm/image_cursors.cc',
'wm/image_cursors.h',
+ 'wm/lock_state_controller.cc',
+ 'wm/lock_state_controller.h',
+ 'wm/lock_state_controller_impl2.cc',
+ 'wm/lock_state_controller_impl2.h',
+ 'wm/lock_state_observer.h',
'wm/maximize_bubble_controller.cc',
'wm/maximize_bubble_controller.h',
'wm/overlay_event_filter.cc',
@@ -412,13 +417,8 @@
'wm/screen_dimmer.h',
'wm/session_state_animator.cc',
'wm/session_state_animator.h',
- 'wm/session_state_controller.cc',
- 'wm/session_state_controller.h',
'wm/session_state_controller_impl.cc',
'wm/session_state_controller_impl.h',
- 'wm/session_state_controller_impl2.cc',
- 'wm/session_state_controller_impl2.h',
- 'wm/session_state_observer.h',
'wm/stacking_controller.cc',
'wm/stacking_controller.h',
'wm/status_area_layout_manager.cc',
@@ -688,12 +688,12 @@
'wm/custom_frame_view_ash_unittest.cc',
'wm/drag_window_resizer_unittest.cc',
'wm/frame_painter_unittest.cc',
+ 'wm/lock_state_controller_impl2_unittest.cc',
'wm/panels/panel_layout_manager_unittest.cc',
'wm/panels/panel_window_resizer_unittest.cc',
'wm/partial_screenshot_view_unittest.cc',
'wm/power_button_controller_unittest.cc',
'wm/screen_dimmer_unittest.cc',
- 'wm/session_state_controller_impl2_unittest.cc',
'wm/stacking_controller_unittest.cc',
'wm/system_gesture_event_filter_unittest.cc',
'wm/system_modal_container_layout_manager_unittest.cc',
