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 --- chrome/chrome_repack_chrome_200_percent.gypi | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'chrome/chrome_repack_chrome_200_percent.gypi') diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index e903d6b..b086d25 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -22,6 +22,11 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak', ], }], + ['chromeos==1', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak', + ], + }], ], }, 'includes': [ '../build/repack_action.gypi' ], -- cgit v1.1