Revert 98679 - Restoring a session should restore window minimization state on Windows

views/widget/native_widget_views.cc

 // 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.
 
 #include "views/widget/native_widget_views.h"
 
 #include "ui/gfx/compositor/compositor.h"
 #include "views/desktop/desktop_window_view.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
@@ skipping 233 matching lines @@
   return input_method;
 }
 
 void NativeWidgetViews::CenterWindow(const gfx::Size& size) {
   const gfx::Size parent_size = GetView()->parent()->size();
   GetView()->SetBounds((parent_size.width() - size.width())/2,
                        (parent_size.height() - size.height())/2,
                        size.width(), size.height());
 }
 
-void NativeWidgetViews::GetWindowPlacement(
+void NativeWidgetViews::GetWindowBoundsAndMaximizedState(
     gfx::Rect* bounds,
-    ui::WindowShowState* show_state) const {
+    bool* maximized) const {
   *bounds = GetView()->bounds();
-  *show_state = ui::SHOW_STATE_NORMAL;
+  *maximized = false;
 }
 
 void NativeWidgetViews::SetWindowTitle(const std::wstring& title) {
 }
 
 void NativeWidgetViews::SetWindowIcons(const SkBitmap& window_icon,
                                        const SkBitmap& app_icon) {
 }
 
 void NativeWidgetViews::SetAccessibleName(const std::wstring& name) {
@@ skipping 73 matching lines @@
   view_->SetVisible(true);
   GetWidget()->SetInitialFocus();
 }
 
 void NativeWidgetViews::Hide() {
   view_->SetVisible(false);
   if (HasMouseCapture())
     ReleaseMouseCapture();
 }
 
-void NativeWidgetViews::ShowWithWindowState(ui::WindowShowState show_state) {
+void NativeWidgetViews::ShowWithState(ShowState state) {
   Show();
 }
 
 void NativeWidgetViews::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   Show();
 }
 
 bool NativeWidgetViews::IsVisible() const {
   return view_->IsVisible();
@@ skipping 145 matching lines @@
 
 const internal::NativeWidgetPrivate*
     NativeWidgetViews::GetParentNativeWidget() const {
   const Widget* containing_widget = view_ ? view_->GetWidget() : NULL;
   return containing_widget ? static_cast<const internal::NativeWidgetPrivate*>(
       containing_widget->native_widget()) :
       NULL;
 }
 
 }  // namespace views