Index: cc/layer_tree_host_impl.h |
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h |
index 5337f19183355dbfc94ae37df5497bf82a81f749..a2739a7d58512efe7af3fb0767a04f03f5ef7a45 100644 |
--- a/cc/layer_tree_host_impl.h |
+++ b/cc/layer_tree_host_impl.h |
@@ -16,6 +16,7 @@ |
#include "cc/render_pass_sink.h" |
#include "cc/renderer.h" |
#include "cc/tile_manager.h" |
+#include "cc/top_controls_manager.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "ui/gfx/rect.h" |
@@ -31,6 +32,7 @@ class LayerTreeImpl; |
class PageScaleAnimation; |
class RenderPassDrawQuad; |
class ResourceProvider; |
+class TopControlsManager; |
struct RendererCapabilities; |
struct RenderingStats; |
@@ -113,7 +115,8 @@ private: |
class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient, |
public RendererClient, |
public TileManagerClient, |
- public OutputSurfaceClient { |
+ public OutputSurfaceClient, |
+ public TopControlsDelegate { |
typedef std::vector<LayerImpl*> LayerList; |
public: |
@@ -205,7 +208,7 @@ public: |
void readback(void* pixels, const gfx::Rect&); |
- LayerTreeImpl* activeTree() { return m_activeTree.get(); } |
+ virtual LayerTreeImpl* activeTree() OVERRIDE; |
LayerTreeImpl* pendingTree() { return m_pendingTree.get(); } |
// TODO(nduca): Remove these in favor of LayerTreeImpl. |
@@ -253,9 +256,9 @@ public: |
void setNeedsAnimateLayers() { m_needsAnimateLayers = true; } |
bool needsUpdateDrawProperties() const { return m_needsUpdateDrawProperties; } |
- void setNeedsUpdateDrawProperties() { m_needsUpdateDrawProperties = true; } |
+ virtual void setNeedsUpdateDrawProperties() OVERRIDE; |
- void setNeedsRedraw(); |
+ virtual void setNeedsRedraw() OVERRIDE; |
void renderingStats(RenderingStats*) const; |
@@ -379,6 +382,8 @@ private: |
bool m_pinchGestureActive; |
gfx::Point m_previousPinchAnchor; |
+ scoped_ptr<TopControlsManager> m_topControlsManager; |
+ |
scoped_ptr<PageScaleAnimation> m_pageScaleAnimation; |
// This is used for ticking animations slowly when hidden. |