diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:10:35 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 20:10:35 +0000 |
| commit | 5bfb6636b2aad4f9ead758800a40f481cabfd912 (patch) | |
| tree | cadbae44d0fafce43b245850bf8bc480a8bcf61a /app/resource_bundle_linux.cc | |
| parent | 61632f50030e10d199c2173cff940af5f264b428 (diff) | |
| download | chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.zip chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.tar.gz chromium_src-5bfb6636b2aad4f9ead758800a40f481cabfd912.tar.bz2 | |
Revert 16173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_linux.cc')
| -rw-r--r-- | app/resource_bundle_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index e27c7b6..6f4b43f 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/app_paths.h" #include "app/gfx/font.h" #include "app/gfx/gtk_util.h" #include "app/l10n_util.h" @@ -19,7 +18,8 @@ #include "base/path_service.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "third_party/skia/include/core/SkBitmap.h" +#include "chrome/common/chrome_paths.h" +#include "SkBitmap.h" namespace { @@ -94,7 +94,7 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) { FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { FilePath locale_path; - PathService::Get(app::DIR_LOCALES, &locale_path); + PathService::Get(chrome::DIR_LOCALES, &locale_path); const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale); if (app_locale.empty()) @@ -105,7 +105,7 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { void ResourceBundle::LoadThemeResources() { FilePath theme_data_path; - PathService::Get(app::DIR_THEMES, &theme_data_path); + PathService::Get(chrome::DIR_THEMES, &theme_data_path); theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak")); theme_data_ = new base::DataPack; bool success = theme_data_->Load(theme_data_path); |