ash/ash.gyp - Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash.

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 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. 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 426d6d14bc2739fd2f650502b644cc0102b869fb..68006f56ddf168fe3e923bd3894c04935ff31cbf 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -411,6 +411,7 @@

'common/system/web_notification/ash_popup_alignment_delegate.h',

'common/system/web_notification/web_notification_tray.cc',

'common/system/web_notification/web_notification_tray.h',

+ 'common/wallpaper/wallpaper_delegate.h',

'common/wm/always_on_top_controller.cc',

'common/wm/always_on_top_controller.h',

'common/wm/background_animator.cc',

@@ -539,8 +540,8 @@

'common/wm_window_tracker.h',

'debug.cc',

'debug.h',

- 'default_user_wallpaper_delegate.cc',

- 'default_user_wallpaper_delegate.h',

+ 'default_wallpaper_delegate.cc',

+ 'default_wallpaper_delegate.h',

'desktop_background/desktop_background_controller.cc',

'desktop_background/desktop_background_controller.h',

'desktop_background/desktop_background_controller_observer.h',

@@ -548,7 +549,6 @@

'desktop_background/desktop_background_view.h',

'desktop_background/desktop_background_widget_controller.cc',

'desktop_background/desktop_background_widget_controller.h',

- 'desktop_background/user_wallpaper_delegate.h',

'display/cursor_window_controller.cc',

'display/cursor_window_controller.h',

'display/display_animator.h',

@@ -889,8 +889,8 @@

'test/test_system_tray_delegate.h',

'test/test_system_tray_item.cc',

'test/test_system_tray_item.h',

- 'test/test_user_wallpaper_delegate.cc',

- 'test/test_user_wallpaper_delegate.h',

+ 'test/test_wallpaper_delegate.cc',

+ 'test/test_wallpaper_delegate.h',

'test/tray_cast_test_api.cc',

'test/tray_cast_test_api.h',

'test/ui_controls_factory_ash.cc',

« no previous file with comments | « ash/accelerators/accelerator_controller_delegate_aura.cc ('k') | ash/common/shell_delegate.h » ('j') | ash/common/shell_delegate.h » ('J')