Revert 166003 - Move Chromoting strings to string_resources.grd and simplify remoting_resources tar…

remoting/webapp/build-webapp.py

Index: remoting/webapp/build-webapp.py
===================================================================
--- remoting/webapp/build-webapp.py	(revision 166010)
+++ remoting/webapp/build-webapp.py	(working copy)
@@ -111,15 +111,20 @@
   # Copy all the locales, preserving directory structure
   destination_locales = os.path.join(destination, "_locales")
   os.mkdir(destination_locales , 0775)
-  locale_dir = "/_locales/"
+  chromium_locale_dir = "/_locales/"
+  chrome_locale_dir = "/_locales.official/"
   for current_locale in locales:
-    pos = current_locale.find(locale_dir)
+    pos = current_locale.find(chromium_locale_dir)
+    locale_len = len(chromium_locale_dir)
     if (pos == -1):
-      raise Exception("Missing locales directory in " + current_locale)
-    subtree = current_locale[pos + len(locale_dir):]
+      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:]
     pos = subtree.find("/")
     if (pos == -1):
-      raise Exception("Malformed locale: " + current_locale)
+      raise "Malformed locale: " + current_locale
     locale_id = subtree[:pos]
     messages = subtree[pos+1:]
     destination_dir = os.path.join(destination_locales, locale_id)