Ensure that in Desktop AURA the WindowModalityController class is at the head of the event pre targ…

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
===================================================================
--- ui/views/widget/desktop_aura/desktop_native_widget_aura.h	(revision 226057)
+++ ui/views/widget/desktop_aura/desktop_native_widget_aura.h	(working copy)
@@ -81,6 +81,11 @@
   // we are being activated/deactivated.
   void HandleActivationChanged(bool active);
 
+  // Installs the window modality controller event filter on the |root|. This
+  // should be invoked by the DesktopRootWindowHost implementation immediately
+  // after creation of the RootWindow.
+  void InstallWindowModalityController(aura::RootWindow* root);
+
  protected:
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
@@ -286,6 +291,9 @@
   // order of the associated views in the widget's view hierarchy.
   scoped_ptr<WindowReorderer> window_reorderer_;
 
+  // See class documentation for Widget in widget.h for a note about type.
+  Widget::InitParams::Type widget_type_;
+
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
 };