Revert 98306 - Create a new views_aura_desktop.

views/widget/native_widget_aura.h

 // Copyright (c) 2011 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 VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #define VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #pragma once
 
-#include "aura/window_delegate.h"
 #include "views/widget/native_widget_private.h"
 
 namespace views {
 
-class NativeWidgetAura : public internal::NativeWidgetPrivate,
-                         public aura::WindowDelegate {
+class NativeWidgetAura : public internal::NativeWidgetPrivate {
  public:
   explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetAura();
 
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
   virtual void UpdateFrameAfterFrameChange() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
@@ skipping 66 matching lines @@
                             const ui::OSExchangeData& data,
                             int operation) OVERRIDE;
   virtual void SchedulePaintInRect(const gfx::Rect& rect) OVERRIDE;
   virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
   virtual void ClearNativeFocus() OVERRIDE;
   virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE;
   virtual bool ConvertPointFromAncestor(
       const Widget* ancestor, gfx::Point* point) const OVERRIDE;
   virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE;
 
-  // Overridden from aura::WindowDelegate:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-
  private:
-  internal::NativeWidgetDelegate* delegate_;
-
-  aura::Window* window_;
-
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_