Revert 132856 - Aura/ash split: Remove hacks and get chrome linking without ash.

ui/views/widget/native_widget_aura.h

Index: ui/views/widget/native_widget_aura.h
===================================================================
--- ui/views/widget/native_widget_aura.h	(revision 132862)
+++ ui/views/widget/native_widget_aura.h	(working copy)
@@ -10,6 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/drag_drop_delegate.h"
+#include "ui/aura/root_window_observer.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events.h"
 #include "ui/views/views_export.h"
@@ -17,6 +18,7 @@
 
 namespace aura {
 class Monitor;
+class RootWindow;
 class Window;
 }
 namespace gfx {
@@ -26,17 +28,19 @@
 namespace views {
 
 class DropHelper;
-class NativeWidgetHelperAura;
 class TooltipManagerAura;
 
 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
                                       public aura::WindowDelegate,
+                                      public aura::RootWindowObserver,
                                       public aura::client::ActivationDelegate,
                                       public aura::client::DragDropDelegate {
  public:
   explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetAura();
 
+  static void set_aura_desktop_hax() { g_aura_desktop_hax = true; }
+
   // TODO(beng): Find a better place for this, and the similar method on
   //             NativeWidgetWin.
   static gfx::Font GetWindowTitleFont();
@@ -148,6 +152,11 @@
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnWindowVisibilityChanged(bool visible) OVERRIDE;
 
+  // Overridden from aura::RootWindowObserver:
+  virtual void OnRootWindowResized(const aura::RootWindow* root,
+                                   const gfx::Size& old_size) OVERRIDE;
+  virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE;
+
   // Overridden from aura::client::ActivationDelegate:
   virtual bool ShouldActivate(const aura::Event* event) OVERRIDE;
   virtual void OnActivated() OVERRIDE;
@@ -182,8 +191,7 @@
 
   internal::NativeWidgetDelegate* delegate_;
 
-  scoped_ptr<NativeWidgetHelperAura> desktop_helper_;
-
+  scoped_ptr<aura::RootWindow> root_window_;
   aura::Window* window_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
@@ -208,6 +216,8 @@
   scoped_ptr<DropHelper> drop_helper_;
   int last_drop_operation_;
 
+  static bool g_aura_desktop_hax;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };
 
Property changes on: ui/views/widget/native_widget_aura.h
___________________________________________________________________
Added: svn:mergeinfo