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

Unified Diff: ash/ash.gyp

Issue 2222653002: Moves CustomFrameViewAsh to common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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/aura/wm_shell_aura.h » ('j') | no next file with comments »
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 5f7aadddcadf7e5d2d2be9253058a35e33887df0..6d2ed2f6600607261d542c5fc3d30befb5a6f9a8 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -83,6 +83,8 @@
'common/frame/caption_buttons/frame_size_button.cc',
'common/frame/caption_buttons/frame_size_button.h',
'common/frame/caption_buttons/frame_size_button_delegate.h',
+ 'common/frame/custom_frame_view_ash.cc',
+ 'common/frame/custom_frame_view_ash.h',
'common/frame/default_header_painter.cc',
'common/frame/default_header_painter.h',
'common/frame/frame_border_hit_test.cc',
@@ -411,6 +413,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/lock_state_observer.h',
@@ -586,10 +590,6 @@
'first_run/first_run_helper.h',
'first_run/first_run_helper_impl.cc',
'first_run/first_run_helper_impl.h',
- 'frame/custom_frame_view_ash.cc',
- 'frame/custom_frame_view_ash.h',
- 'frame/frame_border_hit_test_controller.cc',
- 'frame/frame_border_hit_test_controller.h',
'high_contrast/high_contrast_controller.cc',
'high_contrast/high_contrast_controller.h',
'host/ash_window_tree_host.cc',
@@ -925,6 +925,7 @@
'common/accelerators/accelerator_table_unittest.cc',
'common/display/display_info_unittest.cc',
'common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc',
+ 'common/frame/custom_frame_view_ash_unittest.cc',
'common/frame/default_header_painter_unittest.cc',
'common/material_design/material_design_controller_unittest.cc',
'common/popup_message_unittest.cc',
@@ -980,7 +981,6 @@
'extended_desktop_unittest.cc',
'focus_cycler_unittest.cc',
'frame/caption_buttons/frame_size_button_unittest.cc',
- 'frame/custom_frame_view_ash_unittest.cc',
'host/ash_window_tree_host_x11_unittest.cc',
'magnifier/magnification_controller_unittest.cc',
'metrics/desktop_task_switch_metric_recorder_unittest.cc',
« no previous file with comments | « no previous file | ash/aura/wm_shell_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698