OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_delegate.h" | 9 #include "ash/shell_delegate.h" |
10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_commands.h" | 13 #include "chrome/browser/ui/browser_commands.h" |
14 #include "chrome/browser/ui/browser_finder.h" | 14 #include "chrome/browser/ui/browser_finder.h" |
| 15 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
15 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
16 | 17 |
17 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest; | 18 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest; |
18 | 19 |
19 // Confirm that toggling window miximized works properly | 20 // Confirm that toggling window miximized works properly |
20 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) { | 21 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) { |
21 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate(); | 22 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate(); |
22 ASSERT_TRUE(shell_delegate); | 23 ASSERT_TRUE(shell_delegate); |
23 aura::Window* window = ash::wm::GetActiveWindow(); | 24 aura::Window* window = ash::wm::GetActiveWindow(); |
24 ASSERT_TRUE(window); | 25 ASSERT_TRUE(window); |
25 | 26 |
26 if (ChromeShellDelegate::UseImmersiveFullscreen()) { | 27 if (chrome::UseImmersiveFullscreen()) { |
27 // "ToggleMaximized" toggles immersive fullscreen. | 28 // "ToggleMaximized" toggles immersive fullscreen. |
28 EXPECT_FALSE(ash::wm::IsWindowMaximized(window)); | 29 EXPECT_FALSE(ash::wm::IsWindowMaximized(window)); |
29 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); | 30 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); |
30 shell_delegate->ToggleMaximized(); | 31 shell_delegate->ToggleMaximized(); |
31 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window)); | 32 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window)); |
32 shell_delegate->ToggleMaximized(); | 33 shell_delegate->ToggleMaximized(); |
33 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); | 34 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); |
34 return; | 35 return; |
35 } | 36 } |
36 | 37 |
(...skipping 10 matching lines...) Expand all Loading... |
47 ASSERT_TRUE(browser); | 48 ASSERT_TRUE(browser); |
48 chrome::ToggleFullscreenMode(browser); | 49 chrome::ToggleFullscreenMode(browser); |
49 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window)); | 50 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window)); |
50 shell_delegate->ToggleMaximized(); | 51 shell_delegate->ToggleMaximized(); |
51 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); | 52 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); |
52 EXPECT_FALSE(ash::wm::IsWindowMaximized(window)); | 53 EXPECT_FALSE(ash::wm::IsWindowMaximized(window)); |
53 shell_delegate->ToggleMaximized(); | 54 shell_delegate->ToggleMaximized(); |
54 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); | 55 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window)); |
55 EXPECT_TRUE(ash::wm::IsWindowMaximized(window)); | 56 EXPECT_TRUE(ash::wm::IsWindowMaximized(window)); |
56 } | 57 } |
OLD | NEW |