| Index: ui/aura/root_window_host_linux.cc
|
| ===================================================================
|
| --- ui/aura/root_window_host_linux.cc (revision 160403)
|
| +++ ui/aura/root_window_host_linux.cc (working copy)
|
| @@ -331,9 +331,8 @@
|
|
|
| } // namespace internal
|
|
|
| -RootWindowHostLinux::RootWindowHostLinux(RootWindowHostDelegate* delegate,
|
| - const gfx::Rect& bounds)
|
| - : delegate_(delegate),
|
| +RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds)
|
| + : delegate_(NULL),
|
| xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
|
| xwindow_(0),
|
| x_root_window_(DefaultRootWindow(xdisplay_)),
|
| @@ -698,6 +697,10 @@
|
| XFreeEventData(xev->xgeneric.display, &last_event.xcookie);
|
| }
|
|
|
| +void RootWindowHostLinux::SetDelegate(RootWindowHostDelegate* delegate) {
|
| + delegate_ = delegate;
|
| +}
|
| +
|
| RootWindow* RootWindowHostLinux::GetRootWindow() {
|
| return delegate_->AsRootWindow();
|
| }
|
| @@ -1011,9 +1014,8 @@
|
| }
|
|
|
| // static
|
| -RootWindowHost* RootWindowHost::Create(RootWindowHostDelegate* delegate,
|
| - const gfx::Rect& bounds) {
|
| - return new RootWindowHostLinux(delegate, bounds);
|
| +RootWindowHost* RootWindowHost::Create(const gfx::Rect& bounds) {
|
| + return new RootWindowHostLinux(bounds);
|
| }
|
|
|
| // static
|
|
|