| Index: ui/views/widget/desktop_root_window_host_linux.h
|
| diff --git a/ui/views/widget/desktop_root_window_host_linux.h b/ui/views/widget/desktop_root_window_host_linux.h
|
| index 32acfd1f14b34695e86954f2196ccfe8fdc3523a..cbf65620a0e24da491334e0b8120be9cbe0c253e 100644
|
| --- a/ui/views/widget/desktop_root_window_host_linux.h
|
| +++ b/ui/views/widget/desktop_root_window_host_linux.h
|
| @@ -34,13 +34,15 @@ class DesktopRootWindowHostLinux : public DesktopRootWindowHost,
|
| public aura::RootWindowHost,
|
| public MessageLoop::Dispatcher {
|
| public:
|
| - DesktopRootWindowHostLinux();
|
| + DesktopRootWindowHostLinux(
|
| + internal::NativeWidgetDelegate* native_widget_delegate,
|
| + const gfx::Rect& initial_bounds);
|
| virtual ~DesktopRootWindowHostLinux();
|
|
|
| private:
|
| // Initializes our X11 surface to draw on. This method performs all
|
| // initialization related to talking to the X11 server.
|
| - void InitX11Window(const gfx::Rect& bounds);
|
| + void InitX11Window(const Widget::InitParams& params);
|
|
|
| // Creates an aura::RootWindow to contain the |content_window|, along with
|
| // all aura client objects that direct behavior.
|
| @@ -145,6 +147,10 @@ class DesktopRootWindowHostLinux : public DesktopRootWindowHost,
|
| scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
|
| scoped_ptr<X11WindowEventFilter> x11_window_event_filter_;
|
|
|
| + // TODO(beng): Consider providing an interface to DesktopNativeWidgetAura
|
| + // instead of providing this route back to Widget.
|
| + internal::NativeWidgetDelegate* native_widget_delegate_;
|
| +
|
| aura::RootWindowHostDelegate* root_window_host_delegate_;
|
| aura::Window* content_window_;
|
|
|
|
|