Injected CSS localization fix (see bug no.)

chrome/browser/extensions/user_script_master.h

Index: chrome/browser/extensions/user_script_master.h
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 2df53d8acf5fb433bd7aebae439909bdf6b9a575..f09318bda4851867f4c8433a0e4f7b2af7b93d99 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -6,6 +6,9 @@
 #define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_MASTER_H_
 #pragma once
 
+#include <map>
+#include <string>
+
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -75,11 +78,12 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
     }
 
    private:
- private:
     FRIEND_TEST_ALL_PREFIXES(UserScriptMasterTest, SkipBOMAtTheBeginning);
     FRIEND_TEST_ALL_PREFIXES(UserScriptMasterTest, LeaveBOMNotAtTheBeginning);
     friend class base::RefCountedThreadSafe<UserScriptMaster::ScriptReloader>;
 
+    typedef std::pair<FilePath, std::string> ExtensionPathAndDefaultLocale;

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

This could go into ExtensionSet class, as a public typedef.

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

Done.

+
     ~ScriptReloader() {}
 
     // Where functions are run:
@@ -98,12 +102,15 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
     // tied to the caller.
     void RunLoad(const UserScriptList& user_scripts);
 
-    static void LoadUserScripts(UserScriptList* user_scripts);
+    void LoadUserScripts(UserScriptList* user_scripts);
 
     // A pointer back to our master.
     // May be NULL if DisownMaster() is called.
     UserScriptMaster* master_;
 
+    // Maps extension info needed for localization to an extension ID.
+    std::map<std::string, ExtensionPathAndDefaultLocale> extensions_info_;
+
     // The message loop to call our master back on.
     // Expected to always outlive us.
     BrowserThread::ID master_thread_id_;