Restoring a session should restore window minimization state

Extends session service to support more generalized "show" state encompassing maximized, minimized, and normal window states.  This includes forward-migration logic from old stored session data.  Mac changes to save and restore minimized windows as well as fixes for window position.  Linux/GTK changes to save and restore minimized windows.  Windows/Views changes to follow.

BUG=43274
TEST=Manual. SessionServiceTest.*

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

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

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 3ed5bfd..c4c5b29 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -466,7 +466,7 @@ class SessionRestoreImpl : public NotificationObserver {
       Browser* browser = CreateRestoredBrowser(
           static_cast<Browser::Type>((*i)->type),
           (*i)->bounds,
-          (*i)->is_maximized);
+          (*i)->show_state);
 
       // Restore and show the browser.
       const int initial_tab_count = browser->tab_count();
@@ -616,7 +616,7 @@ class SessionRestoreImpl : public NotificationObserver {
         browser = CreateRestoredBrowser(
             static_cast<Browser::Type>((*i)->type),
             (*i)->bounds,
-            (*i)->is_maximized);
+            (*i)->show_state);
 #if defined(OS_CHROMEOS)
     chromeos::BootTimesLoader::Get()->AddLoginTimeMarker(
         "SessionRestore-CreateRestoredBrowser-End", false);
@@ -710,12 +710,10 @@ class SessionRestoreImpl : public NotificationObserver {
 
   Browser* CreateRestoredBrowser(Browser::Type type,
                                  gfx::Rect bounds,
-                                 bool is_maximized) {
+                                 ui::WindowShowState show_state) {
     Browser* browser = new Browser(type, profile_);
     browser->set_override_bounds(bounds);
-    browser->set_maximized_state(is_maximized ?
-        Browser::MAXIMIZED_STATE_MAXIMIZED :
-        Browser::MAXIMIZED_STATE_UNMAXIMIZED);
+    browser->set_show_state(show_state);
     browser->InitBrowserWindow();
     return browser;
   }