Chromium Code Reviews| Index: cc/trees/proxy_main.h |
| diff --git a/cc/trees/proxy_main.h b/cc/trees/proxy_main.h |
| index a1d6576cd56ba07d4a1a54cbafd3c3116721b941..9314039484ac2ee3f520526e2a699c0260c09131 100644 |
| --- a/cc/trees/proxy_main.h |
| +++ b/cc/trees/proxy_main.h |
| @@ -7,7 +7,7 @@ |
| #include "base/macros.h" |
| #include "cc/base/cc_export.h" |
| -#include "cc/input/top_controls_state.h" |
| +#include "cc/input/browser_controls_state.h" |
| #include "cc/trees/channel_main.h" |
| #include "cc/trees/proxy.h" |
| #include "cc/trees/proxy_common.h" |
| @@ -99,8 +99,8 @@ class CC_EXPORT ProxyMain : public Proxy { |
| void SetMutator(std::unique_ptr<LayerTreeMutator> mutator) override; |
| bool MainFrameWillHappenForTesting() override; |
| void ReleaseCompositorFrameSink() override; |
| - void UpdateTopControlsState(TopControlsState constraints, |
| - TopControlsState current, |
| + void UpdateTopControlsState(BrowserControlsState constraints, |
|
vmpstr
2016/10/21 17:54:59
ditto
mdjones
2016/10/24 21:20:24
Done.
|
| + BrowserControlsState current, |
| bool animate) override; |
| // This sets the channel used by ProxyMain to communicate with ProxyImpl. |