diff options
author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 19:40:28 +0000 |
---|---|---|
committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 19:40:28 +0000 |
commit | ea93fec3e697bedb13f1e60823eeb1edd295a1fd (patch) | |
tree | a417dae0253b5b0a3223e058501bc18da31bc31e /app/resource_bundle_linux.cc | |
parent | 571e31155b13e96295c3423c2da5280c3242e2ac (diff) | |
download | chromium_src-ea93fec3e697bedb13f1e60823eeb1edd295a1fd.zip chromium_src-ea93fec3e697bedb13f1e60823eeb1edd295a1fd.tar.gz chromium_src-ea93fec3e697bedb13f1e60823eeb1edd295a1fd.tar.bz2 |
Move/Copy paths used by app to app_paths.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/113452
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16173 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 6f4b43f..e27c7b6 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -6,6 +6,7 @@ #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" @@ -18,8 +19,7 @@ #include "base/path_service.h" #include "base/string_piece.h" #include "base/string_util.h" -#include "chrome/common/chrome_paths.h" -#include "SkBitmap.h" +#include "third_party/skia/include/core/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(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()) @@ -105,7 +105,7 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) { void ResourceBundle::LoadThemeResources() { FilePath theme_data_path; - PathService::Get(chrome::DIR_THEMES, &theme_data_path); + PathService::Get(app::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); |