trunk/src/ash/ash.gyp - Issue 383373002: Revert 282837 because it broke non-chromeos builds.

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: trunk/src/ash/ash.gyp

Issue 383373002: Revert 282837 because it broke non-chromeos builds. (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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:

Index: trunk/src/ash/ash.gyp

===================================================================

--- trunk/src/ash/ash.gyp (revision 282838)

+++ trunk/src/ash/ash.gyp (working copy)

@@ -26,9 +26,6 @@

'../ui/app_list/app_list.gyp:app_list',

'../ui/aura/aura.gyp:aura',

'../ui/base/ui_base.gyp:ui_base',

- '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',

- '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',

- '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',

'../ui/compositor/compositor.gyp:compositor',

'../ui/events/events.gyp:events',

'../ui/events/events.gyp:events_base',

@@ -334,6 +331,11 @@

'system/chromeos/network/network_connect.cc',

'system/chromeos/network/network_connect.h',

'system/chromeos/network/network_detailed_view.h',

+ 'system/chromeos/network/network_icon.cc',

+ 'system/chromeos/network/network_icon.h',

+ 'system/chromeos/network/network_icon_animation.cc',

+ 'system/chromeos/network/network_icon_animation.h',

+ 'system/chromeos/network/network_icon_animation_observer.h',

'system/chromeos/network/network_observer.h',

'system/chromeos/network/network_portal_detector_observer.h',

'system/chromeos/network/network_state_list_detailed_view.cc',

« no previous file with comments | « no previous file | trunk/src/ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »