Merge 118174 - Don't use command line or prefs for popup saved state

chrome/browser/ui/browser.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 "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 915 matching lines @@
     return gfx::Rect(0, 0, 800, 600);
   }
 
   gfx::Rect restored_bounds = override_bounds_;
   WindowSizer::GetBrowserWindowBounds(app_name_, restored_bounds, this,
                                       &restored_bounds);
   return restored_bounds;
 }
 
 ui::WindowShowState Browser::GetSavedWindowShowState() const {
+  // Only tabbed browsers use the command line or preference state.
+  if (!is_type_tabbed()) {
+    return (show_state_ == ui::SHOW_STATE_DEFAULT)
+        ? ui::SHOW_STATE_NORMAL : show_state_;
+  }
+
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kStartMaximized))
     return ui::SHOW_STATE_MAXIMIZED;
 
   if (show_state_ != ui::SHOW_STATE_DEFAULT)
     return show_state_;
 
   const DictionaryValue* window_pref =
       profile()->GetPrefs()->GetDictionary(GetWindowPlacementKey().c_str());
   bool maximized = false;
   window_pref->GetBoolean("maximized", &maximized);
@@ skipping 4382 matching lines @@
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
   } else {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }