| Index: cc/trees/proxy_main.h
|
| diff --git a/cc/trees/proxy_main.h b/cc/trees/proxy_main.h
|
| index a1d6576cd56ba07d4a1a54cbafd3c3116721b941..5f01bdd474d93216041e805052ea7d3c9e8ee018 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,9 +99,9 @@ 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,
|
| - bool animate) override;
|
| + void UpdateBrowserControlsState(BrowserControlsState constraints,
|
| + BrowserControlsState current,
|
| + bool animate) override;
|
|
|
| // This sets the channel used by ProxyMain to communicate with ProxyImpl.
|
| void SetChannel(std::unique_ptr<ChannelMain> channel_main);
|
|
|