Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

Issue 42353002: Introduce WindowStateDelegate::ToggleFullscreen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: exclude accelerator_commands_browsertest on win Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6
7 #include "apps/shell_window.h"
8 #include "apps/ui/native_app_window.h"
9 #include "ash/accelerators/accelerator_commands.h"
10 #include "ash/ash_switches.h"
11 #include "ash/shell.h"
12 #include "ash/shell_delegate.h"
13 #include "ash/wm/window_state.h"
14 #include "base/command_line.h"
15 #include "chrome/browser/apps/app_browsertest_util.h"
16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_commands.h"
18 #include "chrome/browser/ui/browser_finder.h"
19 #include "chrome/browser/ui/browser_window.h"
20 #include "chrome/test/base/in_process_browser_test.h"
21 #include "ui/aura/client/aura_constants.h"
22
23 namespace {
24
25 // Returns true if |window| is in immersive fullscreen. Infer whether |window|
26 // is in immersive fullscreen based on whether the shelf is hidden when
27 // |window| is fullscreen because DEPS does not allow the test to use
28 // BrowserView. (This is not quite right because the shelf is hidden if a window
29 // is in both immersive fullscreen and tab fullscreen.)
30 bool IsInImmersiveFullscreen(BrowserWindow* browser_window) {
31 ash::wm::WindowState* window_state = ash::wm::GetWindowState(
32 browser_window->GetNativeWindow());
33 return window_state->IsFullscreen() &&
34 !window_state->hide_shelf_when_fullscreen();
35 }
36
37 } // namespace
38
39 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
40
41 // TODO(oshima): Move these tests to ash once ToggleFullscreen is moved
42 // to ash. crbug.com/309837.
43
44 // Confirm that toggling window miximized works properly
45 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) {
46 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
47 ASSERT_TRUE(shell_delegate);
48 ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
49 ASSERT_TRUE(window_state);
50
51 // When not in fullscreen, accelerators::ToggleMaximized toggles Maximized.
52 EXPECT_FALSE(window_state->IsMaximized());
53 ash::accelerators::ToggleMaximized();
54 EXPECT_TRUE(window_state->IsMaximized());
55 ash::accelerators::ToggleMaximized();
56 EXPECT_FALSE(window_state->IsMaximized());
57
58 // When in fullscreen accelerators::ToggleMaximized gets out of fullscreen.
59 EXPECT_FALSE(window_state->IsFullscreen());
60 Browser* browser = chrome::FindBrowserWithWindow(window_state->window());
61 ASSERT_TRUE(browser);
62 chrome::ToggleFullscreenMode(browser);
63 EXPECT_TRUE(window_state->IsFullscreen());
64 ash::accelerators::ToggleMaximized();
65 EXPECT_FALSE(window_state->IsFullscreen());
66 EXPECT_FALSE(window_state->IsMaximized());
67 ash::accelerators::ToggleMaximized();
68 EXPECT_FALSE(window_state->IsFullscreen());
69 EXPECT_TRUE(window_state->IsMaximized());
70 }
71
72 // Confirm that toggling window fullscren works properly.
73 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleFullscreen) {
74 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
75 ASSERT_TRUE(shell_delegate);
76
77 // 1) ToggleFullscreen() should toggle whether a tabbed browser window is in
78 // immersive fullscreen.
79 ASSERT_TRUE(browser()->is_type_tabbed());
80 BrowserWindow* browser_window = browser()->window();
81 ASSERT_TRUE(browser_window->IsActive());
82 EXPECT_FALSE(browser_window->IsMaximized());
83 EXPECT_FALSE(browser_window->IsFullscreen());
84
85 shell_delegate->ToggleFullscreen();
86 EXPECT_TRUE(browser_window->IsFullscreen());
87 EXPECT_TRUE(IsInImmersiveFullscreen(browser_window));
88
89 shell_delegate->ToggleFullscreen();
90 EXPECT_FALSE(browser_window->IsMaximized());
91 EXPECT_FALSE(browser_window->IsFullscreen());
92
93 // 2) ToggleFullscreen() should have no effect on windows which cannot be
94 // maximized.
95 browser_window->GetNativeWindow()->SetProperty(aura::client::kCanMaximizeKey,
96 false);
97 shell_delegate->ToggleFullscreen();
98 EXPECT_FALSE(browser_window->IsMaximized());
99 EXPECT_FALSE(browser_window->IsFullscreen());
100
101 // 3) ToggleFullscreen() should maximize v1 app browser windows which use
102 // AppNonClientFrameViewAsh.
103 // TODO(pkotwicz): Figure out if we actually want this behavior.
104 Browser::CreateParams browser_create_params(Browser::TYPE_POPUP,
105 browser()->profile(), chrome::HOST_DESKTOP_TYPE_NATIVE);
106 #if defined(OS_WIN)
107 browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;
108 #endif // OS_WIN
109 browser_create_params.app_name = "Test";
110 browser_create_params.app_type = Browser::APP_TYPE_HOST;
111
112 Browser* app_host_browser = new Browser(browser_create_params);
113 ASSERT_TRUE(app_host_browser->is_app());
114 AddBlankTabAndShow(app_host_browser);
115 browser_window = app_host_browser->window();
116 ASSERT_TRUE(browser_window->IsActive());
117 EXPECT_FALSE(browser_window->IsMaximized());
118 EXPECT_FALSE(browser_window->IsFullscreen());
119
120 shell_delegate->ToggleFullscreen();
121 EXPECT_TRUE(browser_window->IsMaximized());
122
123 shell_delegate->ToggleFullscreen();
124 EXPECT_FALSE(browser_window->IsMaximized());
125 EXPECT_FALSE(browser_window->IsFullscreen());
126
127 // 4) ToggleFullscreen() should put child windows of v1 apps into
128 // non-immersive fullscreen.
129 browser_create_params.host_desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;
130 browser_create_params.app_type = Browser::APP_TYPE_CHILD;
131 Browser* app_child_browser = new Browser(browser_create_params);
132 ASSERT_TRUE(app_child_browser->is_app());
133 AddBlankTabAndShow(app_child_browser);
134 browser_window = app_child_browser->window();
135 ASSERT_TRUE(browser_window->IsActive());
136 EXPECT_FALSE(browser_window->IsMaximized());
137 EXPECT_FALSE(browser_window->IsFullscreen());
138
139 shell_delegate->ToggleFullscreen();
140 EXPECT_TRUE(browser_window->IsFullscreen());
141 EXPECT_FALSE(IsInImmersiveFullscreen(browser_window));
142
143 shell_delegate->ToggleFullscreen();
144 EXPECT_FALSE(browser_window->IsMaximized());
145 EXPECT_FALSE(browser_window->IsFullscreen());
146
147 // 5) ToggleFullscreen() should put popup browser windows into non-immersive
148 // fullscreen.
149 browser_create_params.app_name = "";
150 Browser* popup_browser = new Browser(browser_create_params);
151 ASSERT_TRUE(popup_browser->is_type_popup());
152 ASSERT_FALSE(popup_browser->is_app());
153 AddBlankTabAndShow(popup_browser);
154 browser_window = popup_browser->window();
155 ASSERT_TRUE(browser_window->IsActive());
156 EXPECT_FALSE(browser_window->IsMaximized());
157 EXPECT_FALSE(browser_window->IsFullscreen());
158
159 shell_delegate->ToggleFullscreen();
160 EXPECT_TRUE(browser_window->IsFullscreen());
161 EXPECT_FALSE(IsInImmersiveFullscreen(browser_window));
162
163 shell_delegate->ToggleFullscreen();
164 EXPECT_FALSE(browser_window->IsMaximized());
165 EXPECT_FALSE(browser_window->IsFullscreen());
166 }
167
168 typedef extensions::PlatformAppBrowserTest
169 ChromeShellDelegatePlatformAppBrowserTest;
170
171 // Test that ToggleFullscreen() toggles the platform app's fullscreen state.
172 IN_PROC_BROWSER_TEST_F(ChromeShellDelegatePlatformAppBrowserTest,
173 ToggleFullscreenPlatformApp) {
174 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
175 ASSERT_TRUE(shell_delegate);
176
177 const extensions::Extension* extension = LoadAndLaunchPlatformApp("minimal");
178 apps::ShellWindow* shell_window = CreateShellWindow(extension);
179 apps::NativeAppWindow* app_window = shell_window->GetBaseWindow();
180 ASSERT_TRUE(shell_window->GetBaseWindow()->IsActive());
181 EXPECT_FALSE(app_window->IsMaximized());
182 EXPECT_FALSE(app_window->IsFullscreen());
183
184 shell_delegate->ToggleFullscreen();
185 EXPECT_TRUE(app_window->IsFullscreen());
186
187 shell_delegate->ToggleFullscreen();
188 EXPECT_FALSE(app_window->IsMaximized());
189 EXPECT_FALSE(app_window->IsFullscreen());
190
191 CloseShellWindow(shell_window);
192 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/views/apps/native_app_window_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698