Implemented the rest of loading/parsing logic for extension i18n:...

chrome/browser/extensions/extension_file_util.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_file_util.h"
 
+#include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/json_value_serializer.h"
 #include "net/base/file_stream.h"
@@ skipping 70 matching lines @@
 
   if (!MoveDirSafely(src_dir, version_dir)) {
     *error = "Could not move extension directory into profile.";
     return false;
   }
 
   scoped_version_dir.Take();
   return true;
 }
 
-Extension* LoadExtension(const FilePath& extension_path, bool require_key,
+Extension* LoadExtension(const FilePath& extension_path,
+                         bool require_key,
                          std::string* error) {
   FilePath manifest_path =
       extension_path.AppendASCII(Extension::kManifestFilename);
   if (!file_util::PathExists(manifest_path)) {
     *error = extension_manifest_errors::kInvalidManifest;
     return NULL;
   }
 
   JSONFileValueSerializer serializer(manifest_path);
   scoped_ptr<Value> root(serializer.Deserialize(error));
@@ skipping 117 matching lines @@
     if (!extension_l10n_util::AddValidLocales(locale_path,
                                               extension,
                                               error)) {
       return false;
     }
 
     if (!extension_l10n_util::ValidateDefaultLocale(extension)) {
       *error = extension_manifest_errors::kLocalesNoDefaultLocaleSpecified;
       return false;
     }
+
+    // We can't call g_browser_process->GetApplicationLocale() since we are not
+    // on the main thread.
+    static const std::string& app_locale = l10n_util::GetApplicationLocale(L"");

[Aaron Boodman, 2009/08/31 21:42:55]

This seems to check the prefs. Is it OK to do that on the file thread?

+    extension->set_application_locale(app_locale);
+    if (!extension_l10n_util::LoadMessageCatalogs(locale_path,
+                                                  extension,
+                                                  error)) {
+      return NULL;
+    }
+    // Replace possible messages in the manifest name and description sections.
+    std::string value = extension->name();

[Aaron Boodman, 2009/08/31 21:42:55]

Instead of reading and then re-writing the name, what about setting the message
handler before InitFromValue(). That way when Extension is init'ing itself, it
can just use the message handler to store the localized value from the
beginning.

+    if (extension->message_handler()->ReplaceMessagesInString(&value)) {
+      extension->set_name(value);
+    } else {
+      *error = StringPrintf("Message \"%s\" is missing but used in a "
+                            "extension name.", value.c_str());
+      return NULL;
+    }
+
+    value = extension->description();
+    if (extension->message_handler()->ReplaceMessagesInString(&value)) {
+      extension->set_description(value);
+    } else {
+      *error = StringPrintf("Message \"%s\" is missing but used in a "
+                            "extension description.", value.c_str());
+      return NULL;
+    }
   }
 
   // Check children of extension root to see if any of them start with _ and is
   // not on the reserved list.
   if (!CheckForIllegalFilenames(extension->path(), error)) {
     return false;
   }
 
   return true;
 }
@@ skipping 98 matching lines @@
         "Filenames starting with \"_\" are reserved for use by the system",
         filename.c_str());
       return false;
     }
   }
 
   return true;
 }
 
 }  // extension_file_util