Restoring a session should restore window minimization state

chrome/browser/ui/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/page_transition_types.h"
 #include "content/common/page_zoom.h"
+#include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 
 class BrowserSyncedWindowDelegate;
 class BrowserTabRestoreServiceDelegate;
 class BrowserWindow;
 class Extension;
 class FindBarController;
 class InstantController;
 class InstantUnloadHandler;
 class PrefService;
@@ skipping 39 matching lines @@
     FEATURE_TITLEBAR = 1,
     FEATURE_TABSTRIP = 2,
     FEATURE_TOOLBAR = 4,
     FEATURE_LOCATIONBAR = 8,
     FEATURE_BOOKMARKBAR = 16,
     FEATURE_INFOBAR = 32,
     FEATURE_SIDEBAR = 64,
     FEATURE_DOWNLOADSHELF = 128
   };
 
-  // Maximized state on creation.
-  enum MaximizedState {
-    // The maximized state is set to the default, which varies depending upon
-    // what the user has done.
-    MAXIMIZED_STATE_DEFAULT,
-
-    // Maximized state is explicitly maximized.
-    MAXIMIZED_STATE_MAXIMIZED,
-
-    // Maximized state is explicitly not maximized (normal).
-    MAXIMIZED_STATE_UNMAXIMIZED
-  };
-
   struct CreateParams {
     CreateParams(Type type, Profile* profile);
 
     // The browser type.
     Type type;
 
     // The associated profile.
     Profile* profile;
 
     // The application name that is also the name of the window to the shell.
@@ skipping 36 matching lines @@
                                Profile* profile);
 
   // Like Create, but creates a tabstrip-less and toolbar-less
   // DevTools "app" window.
   static Browser* CreateForDevTools(Profile* profile);
 
   // Set overrides for the initial window bounds and maximized state.
   void set_override_bounds(const gfx::Rect& bounds) {
     override_bounds_ = bounds;
   }
-  void set_maximized_state(MaximizedState state) {
-    maximized_state_ = state;
+  void set_show_state(ui::WindowShowState show_state) {
+    show_state_ = show_state;
   }
   // Return true if the initial window bounds have been overridden.
   bool bounds_overridden() const {
     return !override_bounds_.IsEmpty();
   }
 
   // Creates the Browser Window. Prefer to use the static helpers above where
   // possible. This does not show the window. You need to call window()->Show()
   // to show it.
   void InitBrowserWindow();
@@ skipping 117 matching lines @@
   // for the new profile as well; it is the static equivalent of the instance
   // method Browser::NewWindow(), used for the creation of a Window from the
   // multi-profile dropdown menu.
   static void NewWindowWithProfile(Profile* profile);
 
   // State Storage and Retrieval for UI ///////////////////////////////////////
 
   // Save and restore the window position.
   std::string GetWindowPlacementKey() const;
   bool ShouldSaveWindowPlacement() const;
-  void SaveWindowPlacement(const gfx::Rect& bounds, bool maximized);
+  void SaveWindowPlacement(const gfx::Rect& bounds,
+                           ui::WindowShowState show_state);
   gfx::Rect GetSavedWindowBounds() const;
-  bool GetSavedMaximizedState() const;
+  ui::WindowShowState GetSavedWindowShowState() const;
 
   // Gets the Favicon of the page in the selected tab.
   SkBitmap GetCurrentPageIcon() const;
 
   // Gets the title of the window based on the selected tab's title.
   string16 GetWindowTitleForCurrentTab() const;
 
   // Prepares a title string for display (removes embedded newlines, etc).
   static void FormatTitleForDisplay(string16* title);
 
@@ skipping 891 matching lines @@
                            // reponse yet.
     RESPONSE_RECEIVED      // The user was prompted and made a decision already.
   };
 
   // State used to figure-out whether we should prompt the user for confirmation
   // when the browser is closed with in-progress downloads.
   CancelDownloadConfirmationState cancel_download_confirmation_state_;
 
   /////////////////////////////////////////////////////////////////////////////
 
-  // Override values for the bounds of the window and its maximized state.
+  // Override values for the bounds of the window and its maximized or minimized
+  // state.
   // These are supplied by callers that don't want to use the default values.
   // The default values are typically loaded from local state (last session),
   // obtained from the last window of the same type, or obtained from the
   // shell shortcut's startup info.
   gfx::Rect override_bounds_;
-  MaximizedState maximized_state_;
+  ui::WindowShowState show_state_;
 
   // The following factory is used to close the frame at a later time.
   ScopedRunnableMethodFactory<Browser> method_factory_;
 
   // The Find Bar. This may be NULL if there is no Find Bar, and if it is
   // non-NULL, it may or may not be visible.
   scoped_ptr<FindBarController> find_bar_controller_;
 
   // Dialog box used for opening and saving files.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
@@ skipping 40 matching lines @@
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_