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

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

Issue 7977025: aura: Make 'ui' buildable without gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | « ui/base/l10n/l10n_util.cc ('k') | ui/base/resource/resource_bundle_linux.cc » ('j') | 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 9f3705c6745947e69008f83bc0b0e63995acc82b..e739262ea70c0d4308aab403443574001f631fc1 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -163,7 +163,7 @@ class UI_EXPORT ResourceBundle {
// Loads and returns a cursor from the app module.
HCURSOR LoadCursor(int cursor_id);
-#elif defined(USE_X11)
+#elif defined(TOOLKIT_USES_GTK)
// Gets the GdkPixbuf with the specified resource_id from the main data pak
// file. Returns a pointer to a shared instance of the GdkPixbuf. This
// shared GdkPixbuf is owned by the resource bundle and should not be freed.
« no previous file with comments | « ui/base/l10n/l10n_util.cc ('k') | ui/base/resource/resource_bundle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698