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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/trees/layer_tree_settings.h

Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class (Closed)
Patch Set: fix confict constant Created 3 years, 10 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 | « cc/trees/layer_tree_impl.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_settings.h
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 9aecae6ee69395b18c7066c0867b4256a138c628..d414879592d942485c8c460bc2a6a68b15b29c12 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -45,8 +45,8 @@ class CC_EXPORT LayerTreeSettings {
enum ScrollbarAnimator {
NO_ANIMATOR,
- LINEAR_FADE,
- THINNING,
+ ANDROID_OVERLAY,
+ AURA_OVERLAY,
};
ScrollbarAnimator scrollbar_animator = NO_ANIMATOR;
base::TimeDelta scrollbar_fade_delay;
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698