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

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 118462)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -933,6 +933,12 @@
 }
 
 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;