Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Unified Diff: ash/ash.gyp

Issue 1888153002: WorkspaceLayoutManagerDelegate -> WorkspaceLayoutManagerBackdropDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | ash/root_window_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 3ef16eb568935d4962fe8ebb6caa233a79a1b1f9..32ec8ec854f91edc53539e579f688957ad8f3778 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -73,8 +73,8 @@
'display/display_change_observer_chromeos.h',
'display/display_color_manager_chromeos.cc',
'display/display_color_manager_chromeos.h',
- 'display/window_tree_host_manager.cc',
- 'display/window_tree_host_manager.h',
+ 'display/display_configuration_controller.cc',
sky 2016/04/14 17:59:58 Sorry for the reordering. I ran tools/git/mass_ren
oshima 2016/04/14 19:12:55 This is actually good thing. Thank you for fixing
+ 'display/display_configuration_controller.h',
'display/display_error_observer_chromeos.cc',
'display/display_error_observer_chromeos.h',
'display/display_info.cc',
@@ -83,15 +83,13 @@
'display/display_layout_store.h',
'display/display_manager.cc',
'display/display_manager.h',
- 'display/display_configuration_controller.cc',
- 'display/display_configuration_controller.h',
'display/display_pref_util.h',
'display/display_util.cc',
'display/display_util.h',
- 'display/extended_mouse_warp_controller.cc',
- 'display/extended_mouse_warp_controller.h',
'display/event_transformation_handler.cc',
'display/event_transformation_handler.h',
+ 'display/extended_mouse_warp_controller.cc',
+ 'display/extended_mouse_warp_controller.h',
'display/json_converter.cc',
'display/json_converter.h',
'display/mirror_window_controller.cc',
@@ -117,6 +115,8 @@
'display/shared_display_edge_indicator.h',
'display/unified_mouse_warp_controller.cc',
'display/unified_mouse_warp_controller.h',
+ 'display/window_tree_host_manager.cc',
+ 'display/window_tree_host_manager.h',
'drag_drop/drag_drop_controller.cc',
'drag_drop/drag_drop_controller.h',
'drag_drop/drag_drop_tracker.cc',
@@ -233,6 +233,8 @@
'shelf/shelf_bezel_event_filter.h',
'shelf/shelf_button.cc',
'shelf/shelf_button.h',
+ 'shelf/shelf_button_pressed_metric_tracker.cc',
+ 'shelf/shelf_button_pressed_metric_tracker.h',
'shelf/shelf_constants.cc',
'shelf/shelf_constants.h',
'shelf/shelf_delegate.h',
@@ -258,8 +260,6 @@
'shelf/shelf_util.h',
'shelf/shelf_view.cc',
'shelf/shelf_view.h',
- 'shelf/shelf_button_pressed_metric_tracker.cc',
- 'shelf/shelf_button_pressed_metric_tracker.h',
'shelf/shelf_widget.cc',
'shelf/shelf_widget.h',
'shelf/shelf_window_watcher.cc',
@@ -525,6 +525,7 @@
'wm/ash_native_cursor_manager.h',
'wm/boot_splash_screen_chromeos.cc',
'wm/boot_splash_screen_chromeos.h',
+ 'wm/common/workspace/workspace_layout_manager_delegate.h',
'wm/coordinate_conversion.cc',
'wm/coordinate_conversion.h',
'wm/cursor_manager_chromeos.cc',
@@ -675,7 +676,7 @@
'wm/workspace/workspace_event_handler.h',
'wm/workspace/workspace_layout_manager.cc',
'wm/workspace/workspace_layout_manager.h',
- 'wm/workspace/workspace_layout_manager_delegate.h',
+ 'wm/workspace/workspace_layout_manager_backdrop_delegate.h',
'wm/workspace/workspace_types.h',
'wm/workspace/workspace_window_resizer.cc',
'wm/workspace/workspace_window_resizer.h',
@@ -902,8 +903,8 @@
'utility/partial_screenshot_controller_unittest.cc',
'virtual_keyboard_controller_unittest.cc',
'wm/always_on_top_controller_unittest.cc',
- 'wm/ash_native_cursor_manager_unittest.cc',
'wm/ash_focus_rules_unittest.cc',
+ 'wm/ash_native_cursor_manager_unittest.cc',
'wm/dock/docked_window_layout_manager_unittest.cc',
'wm/dock/docked_window_resizer_unittest.cc',
'wm/drag_window_resizer_unittest.cc',
« no previous file with comments | « no previous file | ash/root_window_controller.cc » ('j') | ash/root_window_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698