linux_aura: Make combo boxes work with DesktopRootWindowHostLinux.

ui/views/widget/desktop_root_window_host_linux.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
 #define UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
@@ skipping 16 matching lines @@
 }
 
 namespace views {
 class DesktopCaptureClient;
 class X11WindowEventFilter;
 
 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.
   void InitRootWindow(const Widget::InitParams& params);
 
   // Returns true if there's an X window manager present... in most cases.  Some
   // window managers (notably, ion3) don't implement enough of ICCCM for us to
   // detect that they're there.
   bool IsWindowManagerPresent();
 
@@ skipping 84 matching lines @@
   scoped_ptr<aura::DesktopActivationClient> activation_client_;
   scoped_ptr<aura::DesktopDispatcherClient> dispatcher_client_;
 
   // Toplevel event filter which dispatches to other event filters.
   aura::shared::CompoundEventFilter* root_window_event_filter_;
 
   // An event filter that pre-handles all key events to send them to an IME.
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopRootWindowHostLinux);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_ROOT_WINDOW_HOST_LINUX_H_