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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/scrollbar_layer.h

Issue 18191020: UI Resource Manager (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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
« cc/layers/picture_scrollbar_layer.cc ('K') | « cc/layers/picture_scrollbar_layer_impl.cc ('k') | cc/layers/scrollbar_layer.cc » ('j') | cc/resources/ui_resource_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/scrollbar_layer.h
===================================================================
--- cc/layers/scrollbar_layer.h (revision 210393)
+++ cc/layers/scrollbar_layer.h (working copy)
@@ -6,6 +6,9 @@
#define CC_LAYERS_SCROLLBAR_LAYER_H_
#include "cc/base/cc_export.h"
+
+#if USE_REGULAR_SCROLLBAR
+
#include "cc/input/scrollbar.h"
#include "cc/layers/contents_scaling_layer.h"
#include "cc/layers/scrollbar_theme_painter.h"
@@ -91,4 +94,10 @@
} // namespace cc
+#else
+
+#include "cc/layers/picture_scrollbar_layer.h"
+
+#endif
+
#endif // CC_LAYERS_SCROLLBAR_LAYER_H_
« cc/layers/picture_scrollbar_layer.cc ('K') | « cc/layers/picture_scrollbar_layer_impl.cc ('k') | cc/layers/scrollbar_layer.cc » ('j') | cc/resources/ui_resource_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698