| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index dafe34d40683de9cd4fa7a999ea11e5e405ee883..fb0fe72e4786b2f078102bc32582b471bf288cef 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -80,9 +80,6 @@ Compositor::Compositor(const cc::FrameSinkId& frame_sink_id,
|
| context_factory_private_(context_factory_private),
|
| root_layer_(NULL),
|
| widget_(gfx::kNullAcceleratedWidget),
|
| -#if defined(USE_AURA)
|
| - window_(nullptr),
|
| -#endif
|
| widget_valid_(false),
|
| compositor_frame_sink_requested_(false),
|
| frame_sink_id_(frame_sink_id),
|
| @@ -435,16 +432,6 @@ gfx::AcceleratedWidget Compositor::widget() const {
|
| return widget_;
|
| }
|
|
|
| -#if defined(USE_AURA)
|
| -void Compositor::SetWindow(ui::Window* window) {
|
| - window_ = window;
|
| -}
|
| -
|
| -ui::Window* Compositor::window() const {
|
| - return window_;
|
| -}
|
| -#endif
|
| -
|
| scoped_refptr<CompositorVSyncManager> Compositor::vsync_manager() const {
|
| return vsync_manager_;
|
| }
|
|
|