Add a linux stub implementation for resource_bundle.

This should work except for the Load calls that should load .pak files.
We don't generate .pak files yet so I left that code blank for now.

Mac doesn't compile this yet and is still figuring out how they want to handle
resources.

Review URL: http://codereview.chromium.org/21020


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9151 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/common/resource_bundle.h b/chrome/common/resource_bundle.h
index 7af3ac8..062a3a3 100644
--- a/chrome/common/resource_bundle.h
+++ b/chrome/common/resource_bundle.h
@@ -117,7 +117,7 @@ class ResourceBundle {
   // Windows stores resources in DLLs, which are managed by HINSTANCE.
   typedef HINSTANCE DataHandle;
 #elif defined(OS_LINUX)
-  // Linux will use base::DataPack.  TODO(evanm): finish this.
+  // Linux uses base::DataPack.
   typedef base::DataPack* DataHandle;
 #endif
 
@@ -128,8 +128,9 @@ class ResourceBundle {
   // Free skia_images_.
   void FreeImages();
 
-  // Try to load the locale specific strings from an external data module.
-  void LoadLocaleResources(const std::wstring& pref_locale);
+  // Try to load the main resources and the locale specific strings from an
+  // external data module.
+  void LoadResources(const std::wstring& pref_locale);
 
   // Initialize all the ChromeFont members if they haven't yet been initialized.
   void LoadFontsIfNecessary();
@@ -155,6 +156,7 @@ class ResourceBundle {
   Lock lock_;
 
   // Handles for data sources.
+  DataHandle resources_data_;
   DataHandle locale_resources_data_;
   DataHandle theme_data_;