Revert 77773 and 77774.

BUG=none
TBR=sky


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77776 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 16 deletions

diff --git a/views/window/native_window.h b/views/window/native_window.h
index 9236689..6275e1a 100644
--- a/views/window/native_window.h
+++ b/views/window/native_window.h
@@ -6,19 +6,10 @@
 #define VIEWS_WIDGET_NATIVE_WINDOW_H_
 #pragma once
 
-#include "ui/gfx/native_widget_types.h"
 #include "views/accessibility/accessibility_types.h"
 
-class SkBitmap;
-
-namespace gfx {
-class Rect;
-class Size;
-}
-
 namespace views {
 
-class NativeWidget;
 class NonClientFrameView;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -35,8 +26,6 @@ class NativeWindow {
 
   virtual ~NativeWindow() {}
 
-  virtual Window* GetWindow() = 0;
-
  protected:
   friend class Window;
 
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 5e625a6..a24ce61 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -300,10 +300,6 @@ const NativeWidget* WindowGtk::AsNativeWidget() const {
   return this;
 }
 
-Window* WindowGtk::GetWindow() {
-  return this;
-}
-
 void WindowGtk::SetWindowBounds(const gfx::Rect& bounds,
                                 gfx::NativeWindow other_window) {
   // TODO: need to deal with other_window.
diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h
index 5e9915a..1797bf8 100644
--- a/views/window/window_gtk.h
+++ b/views/window/window_gtk.h
@@ -60,7 +60,6 @@ class WindowGtk : public WidgetGtk, public NativeWindow, public Window {
   virtual void SetAccessibleState(AccessibilityTypes::State state) OVERRIDE;
   virtual NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const NativeWidget* AsNativeWidget() const OVERRIDE;
-  virtual Window* GetWindow() OVERRIDE;
   virtual void SetWindowBounds(const gfx::Rect& bounds,
                                gfx::NativeWindow other_window) OVERRIDE;
   virtual void HideWindow() OVERRIDE;