Revert 117165 - Allow a Views client to provide a default frameview for window widgets.

Provides a default one in Ash that will be used to match kennedy-spec.
Much tweaking is needed, but that can come in future CLs.

http://crbug.com/109138
TEST=none
Review URL: http://codereview.chromium.org/9166014

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/9166035

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

4 files changed, 1 insertions, 18 deletions

diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 73eef06..779e23c 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -39,11 +39,6 @@ bool TestViewsDelegate::GetSavedWindowPlacement(
   return false;
 }
 
-NonClientFrameView* TestViewsDelegate::CreateDefaultNonClientFrameView(
-    Widget* widget) {
-  return NULL;
-}
-
 int TestViewsDelegate::GetDispositionForEvent(int event_flags) {
   return 0;
 }
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index 5fa952d..f2c8f69 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -49,8 +49,7 @@ class TestViewsDelegate : public ViewsDelegate {
     return NULL;
   }
 #endif
-  virtual NonClientFrameView* CreateDefaultNonClientFrameView(
-      Widget* widget) OVERRIDE;
+
   virtual void AddRef() OVERRIDE {}
   virtual void ReleaseRef() OVERRIDE {}
 
diff --git a/ui/views/views_delegate.h b/ui/views/views_delegate.h
index 2544413..6194617d 100644
--- a/ui/views/views_delegate.h
+++ b/ui/views/views_delegate.h
@@ -27,7 +27,6 @@ class Clipboard;
 
 namespace views {
 
-class NonClientFrameView;
 class View;
 class Widget;
 
@@ -78,12 +77,6 @@ class VIEWS_EXPORT ViewsDelegate {
   virtual HICON GetDefaultWindowIcon() const = 0;
 #endif
 
-  // Creates a default NonClientFrameView to be used for windows that don't
-  // specify their own. If this function returns NULL, the
-  // views::CustomFrameView type will be used.
-  virtual NonClientFrameView* CreateDefaultNonClientFrameView(
-      Widget* widget) = 0;
-
   // AddRef/ReleaseRef are invoked while a menu is visible. They are used to
   // ensure we don't attempt to exit while a menu is showing.
   virtual void AddRef() = 0;
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index a69a1d2..d00eedd 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -750,10 +750,6 @@ NonClientFrameView* Widget::CreateNonClientFrameView() {
   NonClientFrameView* frame_view = widget_delegate_->CreateNonClientFrameView();
   if (!frame_view)
     frame_view = native_widget_->CreateNonClientFrameView();
-  if (!frame_view && ViewsDelegate::views_delegate) {
-    frame_view =
-        ViewsDelegate::views_delegate->CreateDefaultNonClientFrameView(this);
-  }
   return frame_view ? frame_view : new CustomFrameView(this);
 }