ash/ash.gyp - Issue 12313118: Refactor: Shelf Widget

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/ash.gyp

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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

Index: ash/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index 5cae6a8e34c0ccfbe9ff3bd5d58ae8d7052beaec..d6b5944e6c38046e14d2fcd55510660c1ba6ba70 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -113,8 +113,6 @@

'keyboard_overlay/keyboard_overlay_view.h',

'launcher/app_list_button.cc',

'launcher/app_list_button.h',

- 'launcher/background_animator.cc',

- 'launcher/background_animator.h',

'launcher/launcher.cc',

'launcher/launcher.h',

'launcher/launcher_alignment_menu.cc',

@@ -156,11 +154,17 @@

'screensaver/screensaver_view.cc',

'screensaver/screensaver_view.h',

'screenshot_delegate.h',

+ 'shelf/background_animator.cc',

+ 'shelf/background_animator.h',

+ 'shelf/shelf_layout_manager.cc',

+ 'shelf/shelf_layout_manager.h',

+ 'shelf/shelf_types.h',

+ 'shelf/shelf_widget.cc',

+ 'shelf/shelf_widget.h',

'shell.cc',

'shell.h',

'shell_delegate.h',

'shell_factory.h',

- 'shelf_types.h',

'shell_window_ids.h',

'system/audio/audio_observer.h',

'system/audio/tray_volume.cc',

@@ -378,8 +382,6 @@

'wm/session_state_controller_impl2.cc',

'wm/session_state_controller_impl2.h',

'wm/session_state_observer.h',

- 'wm/shelf_layout_manager.cc',

- 'wm/shelf_layout_manager.h',

'wm/stacking_controller.cc',

'wm/stacking_controller.h',

'wm/status_area_layout_manager.cc',

@@ -601,6 +603,8 @@

'root_window_controller_unittest.cc',

'screen_ash_unittest.cc',

'screensaver/screensaver_view_unittest.cc',

+ 'shelf/shelf_layout_manager_unittest.cc',

+ 'shelf/shelf_widget_unittest.cc',

'shell_unittest.cc',

'shell/app_list.cc',

'shell/bubble.cc',

@@ -632,7 +636,6 @@

'wm/power_button_controller_unittest.cc',

'wm/screen_dimmer_unittest.cc',

'wm/session_state_controller_impl2_unittest.cc',

- 'wm/shelf_layout_manager_unittest.cc',

'wm/system_gesture_event_filter_unittest.cc',

'wm/system_modal_container_layout_manager_unittest.cc',

'wm/toplevel_window_event_handler_unittest.cc',

« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/dip_unittest.cc » ('j') | ash/focus_cycler_unittest.cc » ('J')