Move Chromoting strings to string_resources.grd and simplify remoting_resources target.

Previously all strings were in messages.json files. Moving them to GRD 
file will allow to share them with native components. Also simplified 
how resources are generated:
 1. Now <if> is used to handle branded strings instead of generating 
    grd file in build time
 2. Removed resource_ids - ids are now specified in grd files.

BUG=158995


Review URL: https://chromiumcodereview.appspot.com/11275101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166127 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 10 deletions

diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index 5ac8f1f..a7b9952 100755
--- a/remoting/webapp/build-webapp.py
+++ b/remoting/webapp/build-webapp.py
@@ -111,20 +111,15 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
   # Copy all the locales, preserving directory structure
   destination_locales = os.path.join(destination, "_locales")
   os.mkdir(destination_locales , 0775)
-  chromium_locale_dir = "/_locales/"
-  chrome_locale_dir = "/_locales.official/"
+  locale_dir = "/_locales/"
   for current_locale in locales:
-    pos = current_locale.find(chromium_locale_dir)
-    locale_len = len(chromium_locale_dir)
+    pos = current_locale.find(locale_dir)
     if (pos == -1):
-      pos = current_locale.find(chrome_locale_dir)
-      locale_len = len(chrome_locale_dir)
-    if (pos == -1):
-      raise "Missing locales directory in " + current_locale
-    subtree = current_locale[pos+locale_len:]
+      raise Exception("Missing locales directory in " + current_locale)
+    subtree = current_locale[pos + len(locale_dir):]
     pos = subtree.find("/")
     if (pos == -1):
-      raise "Malformed locale: " + current_locale
+      raise Exception("Malformed locale: " + current_locale)
     locale_id = subtree[:pos]
     messages = subtree[pos+1:]
     destination_dir = os.path.join(destination_locales, locale_id)