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

views/widget/native_widget_gtk.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_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 986 matching lines @@
   } else {
     // We have no parent window, center over the screen.
     center_rect = gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
   }
   gfx::Rect bounds(center_rect.x() + (center_rect.width() - size.width()) / 2,
                    center_rect.y() + (center_rect.height() - size.height()) / 2,
                    size.width(), size.height());
   SetBoundsConstrained(bounds, NULL);
 }
 
-void NativeWidgetGtk::GetWindowPlacement(
-    gfx::Rect* bounds,
-    ui::WindowShowState* show_state) const {
+void NativeWidgetGtk::GetWindowBoundsAndMaximizedState(gfx::Rect* bounds,
+                                                       bool* maximized) const {
   // Do nothing for now. ChromeOS isn't yet saving window placement.
 }
 
 void NativeWidgetGtk::SetWindowTitle(const std::wstring& title) {
   // We don't have a window title on ChromeOS (right now).
 }
 
 void NativeWidgetGtk::SetWindowIcons(const SkBitmap& window_icon,
                                      const SkBitmap& app_icon) {
   // We don't have window icons on ChromeOS.
@@ skipping 160 matching lines @@
     delegate_->OnNativeWidgetVisibilityChanged(false);
   }
 }
 
 void NativeWidgetGtk::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   // TODO: when we add maximization support update this.
   Show();
 }
 
-void NativeWidgetGtk::ShowWithWindowState(ui::WindowShowState show_state) {
+void NativeWidgetGtk::ShowWithState(ShowState state) {
   // No concept of maximization (yet) on ChromeOS.
-  if (show_state == ui::SHOW_STATE_INACTIVE)
+  if (state == internal::NativeWidgetPrivate::SHOW_INACTIVE)
     gtk_window_set_focus_on_map(GetNativeWindow(), false);
   gtk_widget_show(GetNativeView());
 }
 
 bool NativeWidgetGtk::IsVisible() const {
   return GTK_WIDGET_VISIBLE(GetNativeView());
 }
 
 void NativeWidgetGtk::Activate() {
   gtk_window_present(GetNativeWindow());
@@ skipping 867 matching lines @@
   gdk_cairo_region(cr, event->region);
   cairo_fill(cr);
   cairo_destroy(cr);
 }
 
 void NativeWidgetGtk::SaveWindowPosition() {
   // The delegate may have gone away on us.
   if (!GetWidget()->widget_delegate())
     return;
 
-  ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
-  if (IsMaximized())
-    show_state = ui::SHOW_STATE_MAXIMIZED;
-  else if (IsMinimized())
-    show_state = ui::SHOW_STATE_MINIMIZED;
+  bool maximized = window_state_ & GDK_WINDOW_STATE_MAXIMIZED;
   GetWidget()->widget_delegate()->SaveWindowPlacement(
       GetWidget()->GetWindowScreenBounds(),
-      show_state);
+      maximized);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 // static
 void Widget::NotifyLocaleChanged() {
   GList *window_list = gtk_window_list_toplevels();
   for (GList* element = window_list; element; element = g_list_next(element)) {
     Widget* widget =
@@ skipping 151 matching lines @@
     button_pressed = event->type == GDK_BUTTON_PRESS ||
         event->type == GDK_2BUTTON_PRESS ||
         event->type == GDK_3BUTTON_PRESS;
     gdk_event_free(event);
   }
   return button_pressed;
 }
 
 }  // namespace internal
 }  // namespace views