Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: ui/views/widget/desktop_root_window_host_linux.h

Issue 10941040: linux_aura: Make combo boxes work with DesktopRootWindowHostLinux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move the DesktopLayoutManager to ui/views/ Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/desktop_layout_manager.cc ('k') | ui/views/widget/desktop_root_window_host_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ui/views/widget/desktop_layout_manager.cc ('k') | ui/views/widget/desktop_root_window_host_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698