ash/ash.gyp - Issue 843603004: Moves smart deploy UI into the IME tray.

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 843603004: Moves smart deploy UI into the IME tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert accidental edit of a file. Created 5 years, 11 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:

Index: ash/ash.gyp

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

index 0af524a51d319d851e30264620bcd8de59c368e9..667af88b7767b21a492045c399dfdb09850f3355 100644

--- a/ash/ash.gyp

+++ b/ash/ash.gyp

@@ -350,8 +350,8 @@

'system/date/tray_date.cc',

'system/date/tray_date.h',

'system/ime/ime_observer.h',

- 'system/ime/tray_ime.cc',

- 'system/ime/tray_ime.h',

+ 'system/ime/tray_ime_chromeos.cc',

+ 'system/ime/tray_ime_chromeos.h',

'system/keyboard_brightness/keyboard_brightness_control_delegate.h',

'system/locale/locale_notification_controller.cc',

'system/locale/locale_notification_controller.h',

@@ -810,6 +810,7 @@

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

'system/chromeos/tray_display_unittest.cc',

'system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc',

+ 'system/ime/tray_ime_chromeos_unittest.cc',

'system/date/date_view_unittest.cc',

'system/overview/overview_button_tray_unittest.cc',

'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',

« no previous file with comments | « no previous file | ash/ash_chromeos_strings.grdp » ('j') | ash/system/ime/tray_ime_chromeos.h » ('J')