| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 9237ca1aef34ecc9325d2dd5e58fb3b96d9060c6..ef518ba4a2559a3e03465fcd98ecfa8a65a739d3 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -418,10 +418,8 @@
|
| 'common/wm/forwarding_layer_delegate.h',
|
| 'common/wm/fullscreen_window_finder.cc',
|
| 'common/wm/fullscreen_window_finder.h',
|
| - 'common/wm/immersive/wm_immersive_fullscreen_controller.h',
|
| - 'common/wm/immersive/wm_immersive_fullscreen_controller_delegate.h',
|
| - 'common/wm/immersive_revealed_lock.cc',
|
| - 'common/wm/immersive_revealed_lock.h',
|
| + 'common/wm/immersive_context_ash.cc',
|
| + 'common/wm/immersive_context_ash.h',
|
| 'common/wm/lock_state_observer.h',
|
| 'common/wm/maximize_mode/maximize_mode_controller.cc',
|
| 'common/wm/maximize_mode/maximize_mode_controller.h',
|
| @@ -647,7 +645,14 @@
|
| 'shared/immersive_context.cc',
|
| 'shared/immersive_context.h',
|
| 'shared/immersive_focus_watcher.h',
|
| + 'shared/immersive_fullscreen_controller.cc',
|
| + 'shared/immersive_fullscreen_controller.h',
|
| + 'shared/immersive_fullscreen_controller_delegate.h',
|
| 'shared/immersive_gesture_handler.h',
|
| + 'shared/immersive_handler_factory.cc',
|
| + 'shared/immersive_handler_factory.h',
|
| + 'shared/immersive_revealed_lock.cc',
|
| + 'shared/immersive_revealed_lock.h',
|
| 'shelf/dimmer_view.cc',
|
| 'shelf/dimmer_view.h',
|
| 'shelf/shelf.cc',
|
| @@ -716,16 +721,10 @@
|
| 'wm/event_client_impl.h',
|
| 'wm/gestures/overview_gesture_handler.cc',
|
| 'wm/gestures/overview_gesture_handler.h',
|
| - 'wm/immersive_context_ash.cc',
|
| - 'wm/immersive_context_ash.h',
|
| 'wm/immersive_focus_watcher_aura.cc',
|
| 'wm/immersive_focus_watcher_aura.h',
|
| - 'wm/immersive_fullscreen_controller.cc',
|
| - 'wm/immersive_fullscreen_controller.h',
|
| 'wm/immersive_gesture_handler_aura.cc',
|
| 'wm/immersive_gesture_handler_aura.h',
|
| - 'wm/immersive_handler_factory.cc',
|
| - 'wm/immersive_handler_factory.h',
|
| 'wm/immersive_handler_factory_ash.cc',
|
| 'wm/immersive_handler_factory_ash.h',
|
| 'wm/lock_layout_manager.cc',
|
|
|