Load both language packs and the resource dlls in ChromeFrame and look for localized strings

chrome_frame/simple_resource_loader.h

Index: chrome_frame/simple_resource_loader.h
===================================================================
--- chrome_frame/simple_resource_loader.h	(revision 98458)
+++ chrome_frame/simple_resource_loader.h	(working copy)
@@ -17,6 +17,7 @@
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/singleton.h"
+#include "ui/base/resource/data_pack.h"
 
 class SimpleResourceLoader {
  public:
@@ -48,15 +49,17 @@
   SimpleResourceLoader();
   ~SimpleResourceLoader();
 
-  // Finds the most-preferred resource DLL for the laguages in |language_tags|
+  // Finds the most-preferred resource dll and language pack for the laguages
+  // in |language_tags|
   // in |locales_path|.
   //
   // Returns true on success with a handle to the DLL that was loaded in
-  // |dll_handle| and its path in |file_path|.
-  static bool LoadLocaleDll(const std::vector<std::wstring>& language_tags,
-                            const FilePath& locales_path,
-                            HMODULE* dll_handle,
-                            FilePath* file_path);
+  // |dll_handle|, the data pack in data_pack and its path in |file_path|.
+  static bool LoadLocalePack(const std::vector<std::wstring>& language_tags,
+                             const FilePath& locales_path,
+                             HMODULE* dll_handle,
+                             ui::DataPack** data_pack,
+                             FilePath* file_path);

[tony, 2011/08/26 21:36:30]

Nit: Maybe renamed file_path to pak_file_path?

[ananta, 2011/08/26 21:50:17]

Replaced file_path with the language parameter as requested.

 
   // Returns the string resource identified by message_id from the currently
   // loaded locale dll.
@@ -67,6 +70,8 @@
   FRIEND_TEST_ALL_PREFIXES(SimpleResourceLoaderTest, LoadLocaleDll);
 
   std::wstring language_;
+  ui::DataPack* data_pack_;

[tony, 2011/08/26 21:36:30]

Nit: You could probably make this a scoped_ptr.  If not, you could forward
declare the type.

[ananta, 2011/08/26 21:50:17]

Removed the include of the file here and replaced it with a forward declaration.

+
   HINSTANCE locale_dll_handle_;
 };