Injected CSS localization fix (see bug no.)

chrome/browser/extensions/user_script_master.cc

 // Copyright (c) 2011 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/user_script_master.h"
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/extension_file_util.h"
+#include "chrome/common/extensions/extension_message_bundle.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/extension_set.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/notification_service.h"
 
 // Helper function to parse greasesmonkey headers
 static bool GetDeclarationValue(const base::StringPiece& line,
                                 const base::StringPiece& prefix,
                                 std::string* value) {
   base::StringPiece::size_type index = line.find(prefix);
   if (index == base::StringPiece::npos)
     return false;
@@ skipping 101 matching lines @@
     script->add_glob("*");
 
   return true;
 }
 
 void UserScriptMaster::ScriptReloader::StartLoad(
     const UserScriptList& user_scripts) {
   // Add a reference to ourselves to keep ourselves alive while we're running.
   // Balanced by NotifyMaster().
   AddRef();
+
+  const ExtensionInfoMap* info_map = NULL;
+  // Gather extensions information needed for localization.
+  if (master_ && master_->profile_ &&
+      master_->profile_->GetExtensionInfoMap()) {
+    info_map = master_->profile_->GetExtensionInfoMap();
+    // Add a reference to the info_map to keep it alive while we're in the IO
+    // thread iterating through the available extensions set.
+    // Balanced by GatherExtensionsInfo().
+    info_map->AddRef();
+  }
   BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
+      BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
-          this, &UserScriptMaster::ScriptReloader::RunLoad, user_scripts));
+          this, &UserScriptMaster::ScriptReloader::GatherExtensionsInfo,
+          info_map, user_scripts));
 }
 
+
 void UserScriptMaster::ScriptReloader::NotifyMaster(
     base::SharedMemory* memory) {
   // The master went away, so these new scripts aren't useful anymore.
   if (!master_)
     delete memory;
   else
     master_->NewScriptsAvailable(memory);
 
   // Drop our self-reference.
   // Balances StartLoad().
   Release();
 }
 
-static bool LoadScriptContent(UserScript::File* script_file) {
+static bool LoadScriptContent(UserScript::File* script_file,
+                              const SubstitutionMap* localization_messages) {
   std::string content;
   const FilePath& path = ExtensionResource::GetFilePath(
       script_file->extension_root(), script_file->relative_path());
   if (path.empty()) {
     LOG(WARNING) << "Failed to get file path to "
                  << script_file->relative_path().value() << " from "
                  << script_file->extension_root().value();
     return false;
   }
   if (!file_util::ReadFileToString(path, &content)) {
     LOG(WARNING) << "Failed to load user script file: " << path.value();
     return false;
   }
 
+  // Localize the content.
+  if (localization_messages) {
+    std::string error;
+    ExtensionMessageBundle::ReplaceMessagesWithExternalDictionary(
+        *localization_messages, &content, &error);
+    if (!error.empty()) {
+      LOG(WARNING) << "Failed to replace messages in script: " << error;
+    }
+  }
+
   // Remove BOM from the content.
   std::string::size_type index = content.find(kUtf8ByteOrderMark);
   if (index == 0) {
     script_file->set_content(content.substr(strlen(kUtf8ByteOrderMark)));
   } else {
     script_file->set_content(content);
   }
 
   return true;
 }
 
-// static
 void UserScriptMaster::ScriptReloader::LoadUserScripts(
     UserScriptList* user_scripts) {
   for (size_t i = 0; i < user_scripts->size(); ++i) {
     UserScript& script = user_scripts->at(i);
+    scoped_ptr<SubstitutionMap> localization_messages(
+        GetLocalizationMessages(script.extension_id()));
     for (size_t k = 0; k < script.js_scripts().size(); ++k) {
       UserScript::File& script_file = script.js_scripts()[k];
       if (script_file.GetContent().empty())
-        LoadScriptContent(&script_file);
+        LoadScriptContent(&script_file, NULL);
     }
     for (size_t k = 0; k < script.css_scripts().size(); ++k) {
       UserScript::File& script_file = script.css_scripts()[k];
       if (script_file.GetContent().empty())
-        LoadScriptContent(&script_file);
+        LoadScriptContent(&script_file, localization_messages.get());
     }
   }
 }
 
+SubstitutionMap* UserScriptMaster::ScriptReloader::GetLocalizationMessages(
+    std::string extension_id) {
+  if (extensions_info_.find(extension_id) == extensions_info_.end()) {
+    return NULL;
+  }
+
+  return extension_file_util::LoadExtensionMessageBundleSubstitutionMap(
+      extensions_info_[extension_id].first,
+      extension_id,
+      extensions_info_[extension_id].second);
+}
+
 // Pickle user scripts and return pointer to the shared memory.
 static base::SharedMemory* Serialize(const UserScriptList& scripts) {
   Pickle pickle;
   pickle.WriteSize(scripts.size());
   for (size_t i = 0; i < scripts.size(); i++) {
     const UserScript& script = scripts[i];
     // TODO(aa): This can be replaced by sending content script metadata to
     // renderers along with other extension data in ExtensionMsg_Loaded.
     // See crbug.com/70516.
     script.Pickle(&pickle);
@@ skipping 14 matching lines @@
 
   if (!shared_memory->CreateAndMapAnonymous(pickle.size()))
     return NULL;
 
   // Copy the pickle to shared memory.
   memcpy(shared_memory->memory(), pickle.data(), pickle.size());
 
   return shared_memory.release();
 }
 
+// This method will be called on the IO thread
+void UserScriptMaster::ScriptReloader::GatherExtensionsInfo(

[Nebojša Ćirić, 2011/08/19 22:02:25]

Maybe:

CollectExtensionsInfo, GetExtensionsInfo?

+    const ExtensionInfoMap* const info_map,
+    const UserScriptList& user_scripts) {
+  if (info_map) {
+    info_map->extensions().GetExtensionsPathAndDefaultLocale(&extensions_info_);
+    // Drop the reference on the ExtensionInfoMap object after reading from it.
+    // Balances StartLoad().
+    info_map->Release();
+  }
+  BrowserThread::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      NewRunnableMethod(
+          this, &UserScriptMaster::ScriptReloader::RunLoad, user_scripts));
+}
+
 // This method will be called from the file thread
 void UserScriptMaster::ScriptReloader::RunLoad(
     const UserScriptList& user_scripts) {
   LoadUserScripts(const_cast<UserScriptList*>(&user_scripts));
 
   // Scripts now contains list of up-to-date scripts. Load the content in the
   // shared memory and let the master know it's ready. We need to post the task
   // back even if no scripts ware found to balance the AddRef/Release calls
   BrowserThread::PostTask(
       master_thread_id_, FROM_HERE,
@@ skipping 129 matching lines @@
   if (!handle)
     return;
 
   base::SharedMemoryHandle handle_for_process;
   if (!shared_memory->ShareToProcess(handle, &handle_for_process))
     return;  // This can legitimately fail if the renderer asserts at startup.
 
   if (base::SharedMemory::IsHandleValid(handle_for_process))
     process->Send(new ExtensionMsg_UpdateUserScripts(handle_for_process));
 }