Injected CSS localization fix (see bug no.)

chrome/browser/extensions/user_script_master.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_MASTER_H_
 #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"
 #include "base/shared_memory.h"
 #include "chrome/common/extensions/user_script.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 namespace base {
@@ skipping 49 matching lines @@
     // Start loading of scripts.
     // Will always send a message to the master upon completion.
     void StartLoad(const UserScriptList& external_scripts);
 
     // The master is going away; don't call it back.
     void DisownMaster() {
       master_ = NULL;
     }
 
    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:
     //    master          file
     //   StartLoad   ->  RunLoad
     //                     LoadUserScripts()
     // NotifyMaster  <-  RunLoad
 
     // Runs on the master thread.
     // Notify the master that new scripts are available.
     void NotifyMaster(base::SharedMemory* memory);
 
     // Runs on the File thread.
     // Load the specified user scripts, calling NotifyMaster when done.
     // |user_scripts| is intentionally passed by value so its lifetime isn't
     // 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_;
 
     DISALLOW_COPY_AND_ASSIGN(ScriptReloader);
   };
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
@@ skipping 25 matching lines @@
   // finishes.  This boolean tracks whether another load is pending.
   bool pending_load_;
 
   // The profile for which the scripts managed here are installed.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(UserScriptMaster);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_MASTER_H_