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

Unified Diff: ui/gfx/compositor/compositor_setup.h

Issue 9225038: Fold views_compositor=1 into use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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/gfx/compositor/compositor.gyp ('k') | ui/views/view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_setup.h
diff --git a/ui/gfx/compositor/compositor_setup.h b/ui/gfx/compositor/compositor_setup.h
index 717fbf921e5ddd9bc420e3026e4ca39baa7f8aa0..9978e7fe345a63fdebb3fabbf8a7265f67c2e3a9 100644
--- a/ui/gfx/compositor/compositor_setup.h
+++ b/ui/gfx/compositor/compositor_setup.h
@@ -12,7 +12,7 @@ namespace ui {
// Configures the compositor in such a way that it doesn't render anything.
// Does nothing on platforms that aren't using the compositor.
-#if !defined(VIEWS_COMPOSITOR)
+#if !defined(USE_AURA)
// To centralize the ifdef to this file we define the function as doing nothing
// on all platforms that don't use a compositor.
static inline void SetupTestCompositor() {}
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698