From ece882c869353b6a0982892f8f1f40d975930d99 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Sun, 13 Jul 2014 04:03:42 +0000 Subject: chromeos: Move some network related UI in ui/chromeos/ Move the code responsible for showing network icons into a common component so that it can be used from both ash and athena. This also moves the relevant string and image-resources out of ash into separate ui_chromeos_ targets. R=mmoss@chromium.org, oshima@chromium.org, sky@chromium.org, stevenjb@chromium.org TBR=derat@ for third_party/cros_system_api owners BUG=387199 Previously landed in r282837, and reverted in r282839 because it broke non-chromeos builds. Review URL: https://codereview.chromium.org/351353004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282858 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/ash.gyp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ash/ash.gyp') diff --git a/ash/ash.gyp b/ash/ash.gyp index 9976671..d5f413d 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -331,11 +331,6 @@ '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', @@ -726,6 +721,8 @@ # Ash #includes power_supply_properties.pb.h directly. '../chromeos/chromeos.gyp:power_manager_proto', '../device/bluetooth/bluetooth.gyp:device_bluetooth', + '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', + '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', '../ui/display/display.gyp:display', '../ui/display/display.gyp:display_util', -- cgit v1.1