Get rid of the EnableClose() infrastructure in Widget.

Only one place was left using it (FirstRunSearchEngineView), and Brian said that didn't need to use it if it would just pick the first of the engine choices (prior to randomization) as the window was closed.

http://crbug.com/102581
TEST=unittests, and: run organic first run chrome, close the search engine selector, the Google should be the default. run organic first run Chrome, choose a non-Google engine, it should be the default.
Review URL: http://codereview.chromium.org/8618001

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

6 files changed, 0 insertions, 19 deletions

diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index 9019919..fae0d2f 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -192,10 +192,6 @@ void CustomFrameView::GetWindowMask(const gfx::Size& size,
   views::GetDefaultWindowMask(size, window_mask);
 }
 
-void CustomFrameView::EnableClose(bool enable) {
-  close_button_->SetEnabled(enable);
-}
-
 void CustomFrameView::ResetWindowControls() {
   restore_button_->SetState(CustomButton::BS_NORMAL);
   minimize_button_->SetState(CustomButton::BS_NORMAL);
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index 2d2d3d4..111be34 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -41,7 +41,6 @@ class CustomFrameView : public NonClientFrameView,
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
       OVERRIDE;
-  virtual void EnableClose(bool enable) OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
 
diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc
index 1605e3d..c9e8ed2 100644
--- a/ui/views/window/native_frame_view.cc
+++ b/ui/views/window/native_frame_view.cc
@@ -55,10 +55,6 @@ void NativeFrameView::GetWindowMask(const gfx::Size& size,
   // Nothing to do, we use the default window mask.
 }
 
-void NativeFrameView::EnableClose(bool enable) {
-  // Nothing to do, handled automatically by Window.
-}
-
 void NativeFrameView::ResetWindowControls() {
   // Nothing to do.
 }
diff --git a/ui/views/window/native_frame_view.h b/ui/views/window/native_frame_view.h
index edcf993..78d3d77 100644
--- a/ui/views/window/native_frame_view.h
+++ b/ui/views/window/native_frame_view.h
@@ -24,7 +24,6 @@ class VIEWS_EXPORT NativeFrameView : public NonClientFrameView {
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) OVERRIDE;
-  virtual void EnableClose(bool enable) OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
 
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc
index 702042a..c880414 100644
--- a/ui/views/window/non_client_view.cc
+++ b/ui/views/window/non_client_view.cc
@@ -87,10 +87,6 @@ void NonClientView::GetWindowMask(const gfx::Size& size,
   frame_view_->GetWindowMask(size, window_mask);
 }
 
-void NonClientView::EnableClose(bool enable) {
-  frame_view_->EnableClose(enable);
-}
-
 void NonClientView::ResetWindowControls() {
   frame_view_->ResetWindowControls();
 }
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index 9685d95..fc97d69 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -53,7 +53,6 @@ class VIEWS_EXPORT NonClientFrameView : public View {
   virtual int NonClientHitTest(const gfx::Point& point) = 0;
   virtual void GetWindowMask(const gfx::Size& size,
                              gfx::Path* window_mask) = 0;
-  virtual void EnableClose(bool enable) = 0;
   virtual void ResetWindowControls() = 0;
   virtual void UpdateWindowIcon() = 0;
 
@@ -175,10 +174,6 @@ class VIEWS_EXPORT NonClientView : public View {
   // size. This is used to create the non-rectangular window shape.
   void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);
 
-  // Toggles the enable state for the Close button (and the Close menu item in
-  // the system menu).
-  void EnableClose(bool enable);
-
   // Tells the window controls as rendered by the NonClientView to reset
   // themselves to a normal state. This happens in situations where the
   // containing window does not receive a normal sequences of messages that