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

2 files changed, 13 insertions, 1 deletions

diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py
index 977d142..9d3ce20 100755
--- a/chrome/tools/build/repack_locales.py
+++ b/chrome/tools/build/repack_locales.py
@@ -29,6 +29,9 @@ INT_DIR = None
 # The target platform. If it is not defined, sys.platform will be used.
 OS = None
 
+# Note that OS is normally set to 'linux' when building for chromeos.
+CHROMEOS = False
+
 USE_ASH = False
 ENABLE_AUTOFILL_DIALOG = False
 
@@ -84,6 +87,10 @@ def calc_inputs(locale):
     inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings',
                   'ash_strings_%s.pak' % locale))
 
+  if CHROMEOS:
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings',
+                  'ui_chromeos_strings_%s.pak' % locale))
+
   if OS != 'ios':
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak'
     inputs.append(os.path.join(SHARE_INT_DIR, 'webkit',
@@ -171,6 +178,7 @@ def DoMain(argv):
   global SHARE_INT_DIR
   global INT_DIR
   global OS
+  global CHROMEOS
   global USE_ASH
   global WHITELIST
   global ENABLE_AUTOFILL_DIALOG
@@ -196,6 +204,8 @@ def DoMain(argv):
                     help="The target OS. (e.g. mac, linux, win, etc.)")
   parser.add_option("--use-ash", action="store", dest="use_ash",
                     help="Whether to include ash strings")
+  parser.add_option("--chromeos", action="store",
+                    help="Whether building for Chrome OS")
   parser.add_option("--whitelist", action="store", help="Full path to the "
                     "whitelist used to filter output pak file resource IDs")
   parser.add_option("--enable-autofill-dialog", action="store",
@@ -214,6 +224,7 @@ def DoMain(argv):
   BRANDING = options.branding
   EXTRA_INPUT_FILES = options.extra_input
   OS = options.os
+  CHROMEOS = options.chromeos == '1'
   USE_ASH = options.use_ash == '1'
   WHITELIST = options.whitelist
   ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1'
diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
index 2ff3c90..25455f8 100755
--- a/chrome/tools/check_grd_for_unused_strings.py
+++ b/chrome/tools/check_grd_for_unused_strings.py
@@ -133,6 +133,7 @@ def main():
     device_base_dir = os.path.join(src_dir, 'device')
     ui_base_dir = os.path.join(src_dir, 'ui', 'base',)
     ui_base_strings_dir = os.path.join(ui_base_dir, 'strings')
+    ui_chromeos_dir = os.path.join(ui_base_dir, 'chromeos', 'strings')
     grd_files = [
       os.path.join(ash_base_dir, 'ash_strings.grd'),
       os.path.join(ash_base_dir, 'resources', 'ash_resources.grd'),
@@ -156,6 +157,7 @@ def main():
       os.path.join(src_dir, 'ui', 'webui', 'resources', 'webui_resources.grd'),
       os.path.join(ui_base_strings_dir, 'app_locale_settings.grd'),
       os.path.join(ui_base_strings_dir, 'ui_strings.grd'),
+      os.path.join(ui_chromeos_dir, 'ui_chromeos_strings.grd'),
     ]
 
   # If no source directories were given, default them:
@@ -169,7 +171,6 @@ def main():
       os.path.join(src_dir, 'device'),
       os.path.join(src_dir, 'extensions'),
       os.path.join(src_dir, 'ui'),
-      os.path.join(src_dir, 'views'),
       # nsNSSCertHelper.cpp has a bunch of ids
       os.path.join(src_dir, 'third_party', 'mozilla_security_manager'),
       os.path.join(chrome_dir, 'installer'),