diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:53:53 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:53:53 +0000 |
| commit | 947f3a7e1de2905dbfb07b3f67289383117104a0 (patch) | |
| tree | 0d8965615a543d580da758fd000703f69b6a0206 /ui | |
| parent | 230f7b16724ce58df3138077b6584fa62131c522 (diff) | |
| download | chromium_src-947f3a7e1de2905dbfb07b3f67289383117104a0.zip chromium_src-947f3a7e1de2905dbfb07b3f67289383117104a0.tar.gz chromium_src-947f3a7e1de2905dbfb07b3f67289383117104a0.tar.bz2 | |
Remove USE_BASE_DATA_PACK from build_config.h since it's only
used in one file. Inline the usage instead.
Review URL: http://codereview.chromium.org/7538030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h index 692a3aa..85aee33 100644 --- a/ui/base/resource/resource_bundle.h +++ b/ui/base/resource/resource_bundle.h @@ -207,8 +207,8 @@ class UI_API ResourceBundle { #if defined(OS_WIN) // Windows stores resources in DLLs, which are managed by HINSTANCE. typedef HINSTANCE DataHandle; -#elif defined(USE_BASE_DATA_PACK) - // Linux uses base::DataPack. +#elif defined(OS_POSIX) + // Everyone else uses base::DataPack. typedef DataPack* DataHandle; #endif @@ -236,7 +236,7 @@ class UI_API ResourceBundle { // Initialize all the gfx::Font members if they haven't yet been initialized. void LoadFontsIfNecessary(); -#if defined(USE_BASE_DATA_PACK) +#if defined(OS_POSIX) // Returns the full pathname of the main resources file to load. May return // an empty string if no main resources data files are found. static FilePath GetResourcesFilePath(); |