Make packaged apps use AppNonClientFrameViewAsh when maximized

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"
 #include "ash/shell_delegate.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/immersive_fullscreen_configuration.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/aura/client/aura_constants.h"
 
 namespace {
 
 // Returns true if |window| is in immersive fullscreen. Infer whether |window|
 // is in immersive fullscreen based on whether kFullscreenUsesMinimalChromeKey
 // is set for |window| because DEPS does not allow the test to use BrowserView.
 // (This is not quite right because if a window is in both immersive browser
 // fullscreen and in tab fullscreen, kFullScreenUsesMinimalChromeKey will
@@ skipping 126 matching lines @@
 
   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());
 }
 
-typedef extensions::PlatformAppBrowserTest
-    ChromeShellDelegatePlatformAppBrowserTest;
+class ChromeShellDelegatePlatformAppBrowserTest
+    : public extensions::PlatformAppBrowserTest {
+ public:
+  ChromeShellDelegatePlatformAppBrowserTest() {}
+  virtual ~ChromeShellDelegatePlatformAppBrowserTest() {}
 
-// Test that ToggleFullscreen() toggles the platform app's fullscreen state.
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
+    command_line->AppendSwitch(switches::kOpenAsh);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegatePlatformAppBrowserTest);
+};
+
+// Test the behavior of ToggleFullscreen() with packaged apps.
 IN_PROC_BROWSER_TEST_F(ChromeShellDelegatePlatformAppBrowserTest,
                        ToggleFullscreenPlatformApp) {
   ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
   ASSERT_TRUE(shell_delegate);
 
   const extensions::Extension* extension = LoadAndLaunchPlatformApp("minimal");
   apps::ShellWindow* shell_window = CreateShellWindow(extension);
   apps::NativeAppWindow* app_window = shell_window->GetBaseWindow();
   ASSERT_TRUE(shell_window->GetBaseWindow()->IsActive());
   EXPECT_FALSE(app_window->IsMaximized());
   EXPECT_FALSE(app_window->IsFullscreen());
 
   shell_delegate->ToggleFullscreen();
-  EXPECT_TRUE(app_window->IsFullscreen());
+  // If packaged app uses the same frame as hosted apps, ToggleFullscreen()
+  // should maximize the app.
+  if (ash::switches::UseSameFrameForV1AndV2Apps()) {
+    EXPECT_TRUE(app_window->IsMaximized());
+  } else {
+    EXPECT_TRUE(app_window->IsFullscreen());
 
-  shell_delegate->ToggleFullscreen();
-  EXPECT_FALSE(app_window->IsMaximized());
-  EXPECT_FALSE(app_window->IsFullscreen());
+    shell_delegate->ToggleFullscreen();
+    EXPECT_FALSE(app_window->IsMaximized());
+    EXPECT_FALSE(app_window->IsFullscreen());
+  }
 
   CloseShellWindow(shell_window);
 }