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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/BUILD.gn

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 | « no previous file | cc/input/scrollbar_animation_controller.h » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/BUILD.gn
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 1d17fc86c3debe62f4a162b4873b81e55b998ba6..c0bbd2b0a3e3709afbc60efd61250a3630370c98 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -70,10 +70,6 @@ cc_component("cc") {
"input/scroll_state_data.h",
"input/scrollbar_animation_controller.cc",
"input/scrollbar_animation_controller.h",
- "input/scrollbar_animation_controller_linear_fade.cc",
- "input/scrollbar_animation_controller_linear_fade.h",
- "input/scrollbar_animation_controller_thinning.cc",
- "input/scrollbar_animation_controller_thinning.h",
"input/selection.h",
"input/single_scrollbar_animation_controller_thinning.cc",
"input/single_scrollbar_animation_controller_thinning.h",
@@ -755,8 +751,7 @@ cc_test("cc_unittests") {
"debug/rendering_stats_unittest.cc",
"input/browser_controls_offset_manager_unittest.cc",
"input/scroll_state_unittest.cc",
- "input/scrollbar_animation_controller_linear_fade_unittest.cc",
- "input/scrollbar_animation_controller_thinning_unittest.cc",
+ "input/scrollbar_animation_controller_unittest.cc",
"input/single_scrollbar_animation_controller_thinning_unittest.cc",
"ipc/cc_param_traits_unittest.cc",
"ipc/struct_traits_unittest.cc",
« no previous file with comments | « no previous file | cc/input/scrollbar_animation_controller.h » ('j') | content/renderer/gpu/render_widget_compositor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698