diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:26:16 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 22:26:16 +0000 |
| commit | 94060c1fbefd7a6cf3347a42cbad7d9ce66962dc (patch) | |
| tree | 13957b82d149ddfef22434a7eee30dbbd0b2abd9 /app/resource_bundle_win.cc | |
| parent | 53df5df9fa0744b496beb0d9112229a81c79b77a (diff) | |
| download | chromium_src-94060c1fbefd7a6cf3347a42cbad7d9ce66962dc.zip chromium_src-94060c1fbefd7a6cf3347a42cbad7d9ce66962dc.tar.gz chromium_src-94060c1fbefd7a6cf3347a42cbad7d9ce66962dc.tar.bz2 | |
Reland this change. Registers paths for the testing exe, too.
Move/Copy paths used by app to app_paths.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/115420
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_win.cc')
| -rw-r--r-- | app/resource_bundle_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 1d0d28f..82f34b0 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -6,6 +6,7 @@ #include <atlbase.h> +#include "app/app_paths.h" #include "app/gfx/font.h" #include "app/l10n_util.h" #include "base/file_util.h" @@ -14,7 +15,6 @@ #include "base/resource_util.h" #include "base/string_piece.h" #include "base/win_util.h" -#include "chrome/common/chrome_paths.h" namespace { @@ -63,7 +63,7 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { FilePath locale_path; - PathService::Get(chrome::DIR_LOCALES, &locale_path); + PathService::Get(app::DIR_LOCALES, &locale_path); const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale); if (app_locale.empty()) @@ -75,7 +75,7 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { void ResourceBundle::LoadThemeResources() { DCHECK(NULL == theme_data_) << "theme dll already loaded"; std::wstring theme_data_path; - PathService::Get(chrome::DIR_THEMES, &theme_data_path); + PathService::Get(app::DIR_THEMES, &theme_data_path); file_util::AppendToPath(&theme_data_path, L"default.dll"); // The dll should only have resources, not executable code. |