ash: Ensure LAUNCH_WINDOW opens in normal window.

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 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 759 matching lines @@
 
   gfx::Rect window_bounds;
   if (extension) {
     window_bounds.set_width(extension->launch_width());
     window_bounds.set_height(extension->launch_height());
   }
 
   CreateParams params(type, profile);
   params.app_name = app_name;
   params.initial_bounds = window_bounds;
+
+#if defined(USE_ASH)
+  if (extension &&
+      container == extension_misc::LAUNCH_WINDOW) {
+    // In ash, LAUNCH_FULLSCREEN launches in a maximized app window and
+    // LAUNCH_WINDOW launches in a normal app window.
+    ExtensionPrefs::LaunchType launch_type =
+        profile->GetExtensionService()->extension_prefs()->GetLaunchType(
+            extension->id(), ExtensionPrefs::LAUNCH_DEFAULT);
+    if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN)
+      params.initial_show_state = ui::SHOW_STATE_MAXIMIZED;
+    else if (launch_type == ExtensionPrefs::LAUNCH_WINDOW)
+      params.initial_show_state = ui::SHOW_STATE_NORMAL;
+  }
+#endif
+
   Browser* browser = Browser::CreateWithParams(params);
 
   if (app_browser)
     *app_browser = browser;
 
   TabContentsWrapper* wrapper =
       browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_START_PAGE);
   WebContents* contents = wrapper->web_contents();
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   // TODO(stevenjb): Find the right centralized place to do this. Currently it
   // is only done for app tabs in normal browsers through SetExtensionAppById.
   if (extension && type == TYPE_PANEL)
     wrapper->extension_tab_helper()->SetExtensionAppIconById(extension->id());
 
-#if defined(USE_ASH)
-  if (extension &&
-      container == extension_misc::LAUNCH_WINDOW) {
-    // In ash, LAUNCH_FULLSCREEN launches in a maximized app window.
-    ExtensionPrefs::LaunchType launch_type =
-        profile->GetExtensionService()->extension_prefs()->GetLaunchType(
-            extension->id(), ExtensionPrefs::LAUNCH_DEFAULT);
-    if (launch_type == ExtensionPrefs::LAUNCH_FULLSCREEN)
-      browser->window()->Maximize();
-  }
-#endif
-
   browser->window()->Show();
 
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   contents->GetView()->SetInitialFocus();
   return contents;
 }
 
 WebContents* Browser::OpenAppShortcutWindow(Profile* profile,
                                             const GURL& url,
@@ skipping 4679 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }