diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 20:00:13 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 20:00:13 +0000 |
| commit | ef5ff1b40f1024d834620f5cede62dfd4aea6e0c (patch) | |
| tree | 3935dae6b7f1ab45c01bc8f66d6bfee7338d9a9a /app/resource_bundle_win.cc | |
| parent | 0bbb1b1f9842366babce756ab2f1713832be63de (diff) | |
| download | chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.zip chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.gz chromium_src-ef5ff1b40f1024d834620f5cede62dfd4aea6e0c.tar.bz2 | |
Fix to use FilePath version of PathService::Get.
BUG=None
TEST=None
Original Review URL: http://codereview.chromium.org/174189
Patch from Thiago Farina <thiago.farina@gmail.com>.
Review URL: http://codereview.chromium.org/193047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_win.cc')
| -rw-r--r-- | app/resource_bundle_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 30a9ff7..dcb669e 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -74,14 +74,14 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { void ResourceBundle::LoadThemeResources() { DCHECK(NULL == theme_data_) << "theme dll already loaded"; - std::wstring theme_data_path; + FilePath theme_data_path; PathService::Get(app::DIR_THEMES, &theme_data_path); - file_util::AppendToPath(&theme_data_path, L"default.dll"); + theme_data_path = theme_data_path.AppendASCII("default.dll"); // The dll should only have resources, not executable code. - theme_data_ = LoadLibraryEx(theme_data_path.c_str(), NULL, - GetDataDllLoadFlags()); - DCHECK(theme_data_ != NULL) << "unable to load " << theme_data_path; + theme_data_ = LoadLibraryEx(theme_data_path.value().c_str(), NULL, + GetDataDllLoadFlags()); + DCHECK(theme_data_ != NULL) << "unable to load " << theme_data_path.value(); } /* static */ |