[not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to views::ScrollView

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 6a6b423e8bc2b3c631c14470d1b6fddc51ec3261..d7b70c05a37c475d0b8c600ecf9739b4c2662335 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -68,6 +68,7 @@ class CompositorVSyncManager;
 class LatencyInfo;
 class Layer;
 class Reflector;
+class UIScrollInputManager;
 class Texture;
 
 #if defined(USE_AURA)
@@ -386,6 +387,10 @@ class COMPOSITOR_EXPORT Compositor
 
   const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
 
+  UIScrollInputManager* scroll_input_manager() {
+    return scroll_input_manager_.get();
+  }
+
  private:
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;
@@ -433,6 +438,7 @@ class COMPOSITOR_EXPORT Compositor
   scoped_refptr<cc::AnimationTimeline> animation_timeline_;
 
   gfx::ColorSpace color_space_;
+  std::unique_ptr<UIScrollInputManager> scroll_input_manager_;
 
   base::WeakPtrFactory<Compositor> weak_ptr_factory_;