diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 07:23:59 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 07:23:59 +0000 |
| commit | e1cb0e9d4c4eb173d9ee99d9ba3cf5fbc3d38b6a (patch) | |
| tree | 52421316ad00b2a4717c3952953ea643454a6b2f /chrome/browser/browser_main_mac.mm | |
| parent | 4344db043bab42ea807a0f7f2cab386d23ab3607 (diff) | |
| download | chromium_src-e1cb0e9d4c4eb173d9ee99d9ba3cf5fbc3d38b6a.zip chromium_src-e1cb0e9d4c4eb173d9ee99d9ba3cf5fbc3d38b6a.tar.gz chromium_src-e1cb0e9d4c4eb173d9ee99d9ba3cf5fbc3d38b6a.tar.bz2 | |
Load resources.pak, which should be located next to the chrome
binary. resources.pak will contain all the files we currently have in the
resources subdirectory (it currently only has net-internals files).
On Linux, this is an eager load (before the zygote), but on Mac
and Win, this is lazily loaded as needed. This isn't being used
yet, just adding the necessary plumbing for now.
BUG=42770
Review URL: http://codereview.chromium.org/2755006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main_mac.mm')
| -rw-r--r-- | chrome/browser/browser_main_mac.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index ad158dd..eb7d130 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -11,7 +11,9 @@ #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/debug_util.h" +#include "base/file_path.h" #include "base/mac_util.h" +#include "base/path_service.h" #include "base/scoped_nsobject.h" #include "chrome/app/breakpad_mac.h" #import "chrome/browser/app_controller_mac.h" @@ -19,6 +21,7 @@ #import "chrome/browser/chrome_browser_application_mac.h" #import "chrome/browser/cocoa/keystone_glue.h" #include "chrome/browser/metrics/metrics_service.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/main_function_params.h" #include "chrome/common/notification_service.h" #include "chrome/common/result_codes.h" @@ -44,6 +47,10 @@ void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) { // Before we load the nib, we need to start up the resource bundle so we // have the strings avaiable for localization. ResourceBundle::InitSharedInstance(std::wstring()); + + FilePath resources_pack_path; + PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); + ResourceBundle::AddDataPackToSharedInstance(resources_pack_path); } // Now load the nib (from the right bundle). |