summaryrefslogtreecommitdiffstats
path: root/athena/resources
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 09:25:41 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-29 09:25:41 +0000
commit45f0b3a2052cdfffdd08c86119142ecf789b3cad (patch)
treecf04dd3d202d02b672e4520a18cbe5720c9b19cb /athena/resources
parent17cd0c71d96c1340a2cfcd50b6e890e72509dac9 (diff)
downloadchromium_src-45f0b3a2052cdfffdd08c86119142ecf789b3cad.zip
chromium_src-45f0b3a2052cdfffdd08c86119142ecf789b3cad.tar.gz
chromium_src-45f0b3a2052cdfffdd08c86119142ecf789b3cad.tar.bz2
athena: Add a network-selector widget.
The widget allows selecting a network to connect to. It also has basic support for connecting to password protected networks. BUG=387199 R=derat@chromium.org, oshima@chromium.org Review URL: https://codereview.chromium.org/425783003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena/resources')
-rw-r--r--athena/resources/athena_resources.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp
index 5bac548..3e8c7ce 100644
--- a/athena/resources/athena_resources.gyp
+++ b/athena/resources/athena_resources.gyp
@@ -15,6 +15,8 @@
'../../content/content_resources.gyp:content_resources',
'../../extensions/shell/app_shell.gyp:app_shell_pak',
'../../third_party/WebKit/public/blink_resources.gyp:blink_resources',
+ '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
+ '../../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
'../../webkit/webkit_resources.gyp:webkit_strings',
],
'actions': [{
@@ -25,6 +27,8 @@
'<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
],
'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',