Make all v1 app windows use the same maximized window frame

chrome/browser/ui/ash/chrome_shell_delegate_browsertest.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/ash/chrome_shell_delegate.h"
 
 #include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
@@ skipping 83 matching lines @@
   browser_window->GetNativeWindow()->SetProperty(aura::client::kCanMaximizeKey,
                                                  false);
   shell_delegate->ToggleFullscreen();
   EXPECT_FALSE(browser_window->IsMaximized());
   EXPECT_FALSE(browser_window->IsFullscreen());
 
   // 3) ToggleFullscreen() should maximize v1 app browser windows which use
   // AppNonClientFrameViewAsh.
   // TODO(pkotwicz): Figure out if we actually want this behavior.
   Browser::CreateParams browser_create_params(Browser::TYPE_POPUP,
-      browser()->profile(), chrome::HOST_DESKTOP_TYPE_NATIVE);
-#if defined(OS_WIN)
-  browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;
-#endif  // OS_WIN
+      browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH);
   browser_create_params.app_name = "Test";
   browser_create_params.app_type = Browser::APP_TYPE_HOST;
 
   Browser* app_host_browser = new Browser(browser_create_params);
   ASSERT_TRUE(app_host_browser->is_app());
   AddBlankTabAndShow(app_host_browser);
   browser_window = app_host_browser->window();
   ASSERT_TRUE(browser_window->IsActive());
   EXPECT_FALSE(browser_window->IsMaximized());
   EXPECT_FALSE(browser_window->IsFullscreen());
 
   shell_delegate->ToggleFullscreen();
   EXPECT_TRUE(browser_window->IsMaximized());
 
   shell_delegate->ToggleFullscreen();
   EXPECT_FALSE(browser_window->IsMaximized());
   EXPECT_FALSE(browser_window->IsFullscreen());
 
-  // 4) ToggleFullscreen() should put child windows of v1 apps into
-  // non-immersive fullscreen.
-  browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
-  browser_create_params.app_type = Browser::APP_TYPE_CHILD;
-  Browser* app_child_browser = new Browser(browser_create_params);
-  ASSERT_TRUE(app_child_browser->is_app());
-  AddBlankTabAndShow(app_child_browser);
-  browser_window = app_child_browser->window();
-  ASSERT_TRUE(browser_window->IsActive());
-  EXPECT_FALSE(browser_window->IsMaximized());
-  EXPECT_FALSE(browser_window->IsFullscreen());
-
-  shell_delegate->ToggleFullscreen();
-  EXPECT_TRUE(browser_window->IsFullscreen());
-  EXPECT_FALSE(IsInImmersiveFullscreen(browser_window));
-
-  shell_delegate->ToggleFullscreen();
-  EXPECT_FALSE(browser_window->IsMaximized());
-  EXPECT_FALSE(browser_window->IsFullscreen());
-
-  // 5) ToggleFullscreen() should put popup browser windows into non-immersive
+  // 4) ToggleFullscreen() should put popup browser windows into non-immersive
   // fullscreen.
   browser_create_params.app_name = "";
   Browser* popup_browser = new Browser(browser_create_params);
   ASSERT_TRUE(popup_browser->is_type_popup());
   ASSERT_FALSE(popup_browser->is_app());
   AddBlankTabAndShow(popup_browser);
   browser_window = popup_browser->window();
   ASSERT_TRUE(browser_window->IsActive());
   EXPECT_FALSE(browser_window->IsMaximized());
   EXPECT_FALSE(browser_window->IsFullscreen());
@@ skipping 25 matching lines @@
 
   shell_delegate->ToggleFullscreen();
   EXPECT_TRUE(app_window->IsFullscreen());
 
   shell_delegate->ToggleFullscreen();
   EXPECT_FALSE(app_window->IsMaximized());
   EXPECT_FALSE(app_window->IsFullscreen());
 
   CloseShellWindow(shell_window);
 }