ash/ash.gyp - Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access

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 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix control reaches end of non-void function warnings 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

Index: ash/ash.gyp

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

index f1627abc0ca04c3f80dab6f8dc60f85bfbfd5a46..836c99dc6a530869fa7b0e05eb08cda9afd1ecbb 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -141,6 +141,7 @@

'common/shelf/shelf_constants.cc',

'common/shelf/shelf_constants.h',

'common/shelf/shelf_delegate.h',

+ 'common/shelf/shelf_icon_observer.h',

'common/shelf/shelf_item_delegate.h',

'common/shelf/shelf_item_types.cc',

'common/shelf/shelf_item_types.h',

@@ -155,10 +156,13 @@

'common/shelf/shelf_tooltip_manager.cc',

'common/shelf/shelf_tooltip_manager.h',

'common/shelf/shelf_types.h',

+ 'common/shelf/shelf_view.cc',

+ 'common/shelf/shelf_view.h',

'common/shelf/shelf_window_watcher.cc',

'common/shelf/shelf_window_watcher.h',

'common/shelf/shelf_window_watcher_item_delegate.cc',

'common/shelf/shelf_window_watcher_item_delegate.h',

+ 'common/shelf/wm_shelf.cc',

'common/shelf/wm_shelf.h',

'common/shelf/wm_shelf_observer.h',

'common/shelf/wm_shelf_util.cc',

@@ -646,14 +650,11 @@

'shelf/shelf.h',

'shelf/shelf_bezel_event_filter.cc',

'shelf/shelf_bezel_event_filter.h',

- 'shelf/shelf_icon_observer.h',

'shelf/shelf_layout_manager.cc',

'shelf/shelf_layout_manager.h',

'shelf/shelf_layout_manager_observer.h',

'shelf/shelf_util.cc',

'shelf/shelf_util.h',

- 'shelf/shelf_view.cc',

- 'shelf/shelf_view.h',

'shelf/shelf_widget.cc',

'shelf/shelf_widget.h',

'shelf/shelf_window_targeter.cc',

« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »