Injected CSS localization fix (see bug no.)

chrome/browser/extensions/execute_code_in_tab_function.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/execute_code_in_tab_function.h"
 
 #include "base/callback.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
+#include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/extension_message_bundle.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/common/notification_service.h"
 
 namespace keys = extension_tabs_module_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
       all_frames_(false) {
@@ skipping 123 matching lines @@
     return false;
   }
 
   const Extension* extension = GetExtension();
   if (!extension) {
     SendResponse(false);
     return false;
   }
 
   bool is_js_code = true;
+  std::string code_string_to_execute = code_string;

[Nebojša Ćirić, 2011/08/10 20:38:57]

Why change name here? You could just rename the function parameter. Am I missing
something?

[adriansc, 2011/08/10 23:20:53]

The code_string gets passed in the binding as a const std::string reference. In
order to do message replacement, it has to be mutable. I added a comment.

   std::string function_name = name();
   if (function_name == TabsInsertCSSFunction::function_name()) {
     is_js_code = false;
+    // Localize CSS messages.
+    std::string error;
+    const SubstitutionMap localization_messages =
+        extension_file_util::LoadExtensionMessageBundleSubstitutionMap(
+            extension->path(), extension->id(), extension->default_locale());
+    ExtensionMessageBundle::ReplaceMessagesWithExternalDictionary(
+        localization_messages, &code_string_to_execute, &error);

[Nebojša Ćirić, 2011/08/10 20:38:57]

If this code snippet shows up in other places you could create a helper method
in extension_i18n_utils - like LocalizeCSS.

[adriansc, 2011/08/10 23:20:53]

Moved to extension_l10n_utils

   } else if (function_name != TabsExecuteScriptFunction::function_name()) {
     DCHECK(false);
   }
 
   ExtensionMsg_ExecuteCode_Params params;
   params.request_id = request_id();
   params.extension_id = extension->id();
   params.is_javascript = is_js_code;
-  params.code = code_string;
+  params.code = code_string_to_execute;
   params.all_frames = all_frames_;
   params.in_main_world = false;
   contents->render_view_host()->Send(new ExtensionMsg_ExecuteCode(
       contents->render_view_host()->routing_id(), params));
 
   Observe(contents->tab_contents());
   AddRef();  // balanced in OnExecuteCodeFinished()
   return true;
 }
 
@@ skipping 24 matching lines @@
   if (!error.empty()) {
     CHECK(!success);
     error_ = error;
   }
 
   SendResponse(success);
 
   Observe(NULL);
   Release();  // balanced in Execute()
 }