Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: ui/base/resource/resource_bundle.h

Issue 7538030: Remove USE_BASE_DATA_PACK from build_config.h since it's only (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: os_posix Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/build_config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 692a3aab934f44db7f2dde52c5783c2cb1a2dfbd..85aee337b5d29cc6d68c84913d9b8c51fa75630e 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();
« no previous file with comments | « build/build_config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698