| Index: ash/ash.gyp
|
| ===================================================================
|
| --- ash/ash.gyp (revision 165163)
|
| +++ ash/ash.gyp (working copy)
|
| @@ -388,16 +388,16 @@
|
| 'wm/workspace/snap_sizer.cc',
|
| 'wm/workspace/snap_sizer.h',
|
| 'wm/workspace/snap_types.h',
|
| - 'wm/workspace/workspace2.cc',
|
| - 'wm/workspace/workspace2.h',
|
| + 'wm/workspace/workspace.cc',
|
| + 'wm/workspace/workspace.h',
|
| 'wm/workspace/workspace_animations.cc',
|
| 'wm/workspace/workspace_animations.h',
|
| 'wm/workspace/workspace_event_handler.cc',
|
| 'wm/workspace/workspace_event_handler.h',
|
| - 'wm/workspace/workspace_layout_manager2.cc',
|
| - 'wm/workspace/workspace_layout_manager2.h',
|
| - 'wm/workspace/workspace_manager2.cc',
|
| - 'wm/workspace/workspace_manager2.h',
|
| + 'wm/workspace/workspace_layout_manager.cc',
|
| + 'wm/workspace/workspace_layout_manager.h',
|
| + 'wm/workspace/workspace_manager.cc',
|
| + 'wm/workspace/workspace_manager.h',
|
| 'wm/workspace/workspace_types.h',
|
| 'wm/workspace/workspace_window_resizer.cc',
|
| 'wm/workspace/workspace_window_resizer.h',
|
| @@ -561,8 +561,8 @@
|
| 'wm/workspace/workspace_event_handler_test_helper.cc',
|
| 'wm/workspace/workspace_event_handler_test_helper.h',
|
| 'wm/workspace/workspace_event_handler_unittest.cc',
|
| - 'wm/workspace/workspace_layout_manager2_unittest.cc',
|
| - 'wm/workspace/workspace_manager2_unittest.cc',
|
| + 'wm/workspace/workspace_layout_manager_unittest.cc',
|
| + 'wm/workspace/workspace_manager_unittest.cc',
|
| 'wm/workspace/workspace_window_resizer_unittest.cc',
|
| '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc',
|
| ],
|
|
|