Reverting r14276 (http://codereview.chromium.org/88069) which causes unit test breakage.

Example: http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests%20(dbg)(2)/builds/1268/steps/unit_tests/logs/stdio

TBR=http://codereview.chromium.org/95010


Review URL: http://codereview.chromium.org/95010

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

5 files changed, 0 insertions, 20 deletions

diff --git a/chrome/views/widget/widget_win.h b/chrome/views/widget/widget_win.h
index 110a0b4..ede4252 100644
--- a/chrome/views/widget/widget_win.h
+++ b/chrome/views/widget/widget_win.h
@@ -178,7 +178,6 @@ class WidgetWin : public Widget,
     MSG_WM_ENDSESSION(OnEndSession)
     MSG_WM_ENTERSIZEMOVE(OnEnterSizeMove)
     MSG_WM_EXITMENULOOP(OnExitMenuLoop)
-    MSG_WM_GETMINMAXINFO(OnGetMinMaxInfo)
     MSG_WM_HSCROLL(OnHScroll)
     MSG_WM_INITMENU(OnInitMenu)
     MSG_WM_INITMENUPOPUP(OnInitMenuPopup)
@@ -377,9 +376,6 @@ class WidgetWin : public Widget,
   }
   virtual LRESULT OnEraseBkgnd(HDC dc);
   virtual LRESULT OnGetObject(UINT uMsg, WPARAM w_param, LPARAM l_param);
-  virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info) {
-    SetMsgHandled(FALSE);
-  }
   virtual void OnHScroll(int scroll_type, short position, HWND scrollbar) {
     SetMsgHandled(FALSE);
   }
diff --git a/chrome/views/window/non_client_view.cc b/chrome/views/window/non_client_view.cc
index 29daf06..bc69587 100644
--- a/chrome/views/window/non_client_view.cc
+++ b/chrome/views/window/non_client_view.cc
@@ -131,17 +131,10 @@ void NonClientView::LayoutFrameView() {
 // NonClientView, View overrides:
 
 gfx::Size NonClientView::GetPreferredSize() {
-  // TODO(pkasting): This should probably be made to look similar to
-  // GetMinimumSize() below.  This will require implementing GetPreferredSize()
-  // better in the various frame views.
   gfx::Rect client_bounds(gfx::Point(), client_view_->GetPreferredSize());
   return GetWindowBoundsForClientBounds(client_bounds).size();
 }
 
-gfx::Size NonClientView::GetMinimumSize() {
-  return frame_view_->GetMinimumSize();
-}
-
 void NonClientView::Layout() {
   LayoutFrameView();
 
diff --git a/chrome/views/window/non_client_view.h b/chrome/views/window/non_client_view.h
index e82ec77..0481cfd 100644
--- a/chrome/views/window/non_client_view.h
+++ b/chrome/views/window/non_client_view.h
@@ -192,7 +192,6 @@ class NonClientView : public View {
 
   // NonClientView, View overrides:
   virtual gfx::Size GetPreferredSize();
-  virtual gfx::Size GetMinimumSize();
   virtual void Layout();
 
  protected:
diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc
index 8c03219..3d2c74f 100644
--- a/chrome/views/window/window_win.cc
+++ b/chrome/views/window/window_win.cc
@@ -640,13 +640,6 @@ void WindowWin::OnFinalMessage(HWND window) {
   WidgetWin::OnFinalMessage(window);
 }
 
-void WindowWin::OnGetMinMaxInfo(MINMAXINFO* minmax_info) {
-  gfx::Size min_window_size(GetNonClientView()->GetMinimumSize());
-  minmax_info->ptMinTrackSize.x = min_window_size.width();
-  minmax_info->ptMinTrackSize.y = min_window_size.height();
-  WidgetWin::OnGetMinMaxInfo(minmax_info);
-}
-
 namespace {
 static void EnableMenuItem(HMENU menu, UINT command, bool enabled) {
   UINT flags = MF_BYCOMMAND | (enabled ? MF_ENABLED : MF_DISABLED | MF_GRAYED);
diff --git a/chrome/views/window/window_win.h b/chrome/views/window/window_win.h
index 222ac52..cd7bd50 100644
--- a/chrome/views/window/window_win.h
+++ b/chrome/views/window/window_win.h
@@ -129,7 +129,6 @@ class WindowWin : public WidgetWin,
   virtual LRESULT OnDwmCompositionChanged(UINT msg, WPARAM w_param,
                                           LPARAM l_param);
   virtual void OnFinalMessage(HWND window);
-  virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info);
   virtual void OnInitMenu(HMENU menu);
   virtual void OnMouseLeave();
   virtual LRESULT OnNCActivate(BOOL active);