ash/ash.gyp - Issue 2139183003: mash: Migrate //ash/system/toast to WM common types

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 2139183003: mash: Migrate //ash/system/toast to WM common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 83fc888e75e6d67fc9bf9c21823946c2b15a4c89..bb2c9ebfba71f7c5b148d04461ea76c9eded8bb0 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -223,6 +223,12 @@

'common/system/status_area_widget_delegate.h',

'common/system/system_notifier.cc',

'common/system/system_notifier.h',

+ 'common/system/toast/toast_data.cc',

+ 'common/system/toast/toast_data.h',

+ 'common/system/toast/toast_manager.cc',

+ 'common/system/toast/toast_manager.h',

+ 'common/system/toast/toast_overlay.cc',

+ 'common/system/toast/toast_overlay.h',

'common/system/tray/actionable_view.cc',

'common/system/tray/actionable_view.h',

'common/system/tray/default_system_tray_delegate.cc',

@@ -634,12 +640,6 @@

'system/chromeos/tray_display.h',

'system/status_area_widget.cc',

'system/status_area_widget.h',

- 'system/toast/toast_data.cc',

- 'system/toast/toast_data.h',

- 'system/toast/toast_manager.cc',

- 'system/toast/toast_manager.h',

- 'system/toast/toast_overlay.cc',

- 'system/toast/toast_overlay.h',

'system/tray/system_tray.cc',

'system/tray/system_tray.h',

'touch/touch_hud_debug.cc',

@@ -909,6 +909,7 @@

'common/system/chromeos/supervised/tray_supervised_user_unittest.cc',

'common/system/date/date_view_unittest.cc',

'common/system/ime/tray_ime_chromeos_unittest.cc',

+ 'common/system/toast/toast_manager_unittest.cc',

'common/system/tray/tray_details_view_unittest.cc',

'common/system/update/tray_update_unittest.cc',

'common/system/user/tray_user_unittest.cc',

@@ -971,7 +972,6 @@

'system/chromeos/rotation/tray_rotation_lock_unittest.cc',

'system/chromeos/tray_display_unittest.cc',

'system/overview/overview_button_tray_unittest.cc',

- 'system/toast/toast_manager_unittest.cc',

'system/tray/system_tray_unittest.cc',

'system/web_notification/ash_popup_alignment_delegate_unittest.cc',

'system/web_notification/web_notification_tray_unittest.cc',

« no previous file with comments | « ash/accelerators/debug_commands.cc ('k') | ash/common/system/toast/DEPS » ('j') | ash/common/system/toast/DEPS » ('J')