OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/common/accelerators/accelerator_commands.h" | 5 #include "ash/common/accelerators/accelerator_commands.h" |
6 | 6 |
7 #include "ash/accelerators/accelerator_commands_aura.h" | 7 #include "ash/accelerators/accelerator_commands_aura.h" |
8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
9 #include "ash/common/wm_window.h" | 9 #include "ash/common/wm_window.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 // maximized. | 142 // maximized. |
143 ash::WmWindow::GetAuraWindow(window_state->window()) | 143 ash::WmWindow::GetAuraWindow(window_state->window()) |
144 ->SetProperty(aura::client::kResizeBehaviorKey, | 144 ->SetProperty(aura::client::kResizeBehaviorKey, |
145 ui::mojom::kResizeBehaviorNone); | 145 ui::mojom::kResizeBehaviorNone); |
146 ash::accelerators::ToggleFullscreen(); | 146 ash::accelerators::ToggleFullscreen(); |
147 EXPECT_TRUE(IsInitialShowState(window_state)); | 147 EXPECT_TRUE(IsInitialShowState(window_state)); |
148 | 148 |
149 // 3) Hosted apps. | 149 // 3) Hosted apps. |
150 Browser::CreateParams browser_create_params( | 150 Browser::CreateParams browser_create_params( |
151 Browser::CreateParams::CreateForApp("Test", true /* trusted_source */, | 151 Browser::CreateParams::CreateForApp("Test", true /* trusted_source */, |
152 gfx::Rect(), browser()->profile())); | 152 gfx::Rect(), browser()->profile(), |
| 153 true)); |
153 | 154 |
154 Browser* app_host_browser = new Browser(browser_create_params); | 155 Browser* app_host_browser = new Browser(browser_create_params); |
155 ASSERT_TRUE(app_host_browser->is_app()); | 156 ASSERT_TRUE(app_host_browser->is_app()); |
156 AddBlankTabAndShow(app_host_browser); | 157 AddBlankTabAndShow(app_host_browser); |
157 window_state = | 158 window_state = |
158 ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow()); | 159 ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow()); |
159 ASSERT_TRUE(window_state->IsActive()); | 160 ASSERT_TRUE(window_state->IsActive()); |
160 SetToInitialShowState(window_state); | 161 SetToInitialShowState(window_state); |
161 EXPECT_TRUE(IsInitialShowState(window_state)); | 162 EXPECT_TRUE(IsInitialShowState(window_state)); |
162 | 163 |
163 ash::accelerators::ToggleFullscreen(); | 164 ash::accelerators::ToggleFullscreen(); |
164 EXPECT_TRUE(window_state->IsFullscreen()); | 165 EXPECT_TRUE(window_state->IsFullscreen()); |
165 EXPECT_TRUE(IsInImmersiveFullscreen(window_state)); | 166 EXPECT_TRUE(IsInImmersiveFullscreen(window_state)); |
166 | 167 |
167 ash::accelerators::ToggleFullscreen(); | 168 ash::accelerators::ToggleFullscreen(); |
168 EXPECT_TRUE(IsInitialShowState(window_state)); | 169 EXPECT_TRUE(IsInitialShowState(window_state)); |
169 | 170 |
170 // 4) Popup browser windows. | 171 // 4) Popup browser windows. |
171 browser_create_params = | 172 browser_create_params = |
172 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile()); | 173 Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(), true); |
173 Browser* popup_browser = new Browser(browser_create_params); | 174 Browser* popup_browser = new Browser(browser_create_params); |
174 ASSERT_TRUE(popup_browser->is_type_popup()); | 175 ASSERT_TRUE(popup_browser->is_type_popup()); |
175 ASSERT_FALSE(popup_browser->is_app()); | 176 ASSERT_FALSE(popup_browser->is_app()); |
176 AddBlankTabAndShow(popup_browser); | 177 AddBlankTabAndShow(popup_browser); |
177 window_state = | 178 window_state = |
178 ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow()); | 179 ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow()); |
179 ASSERT_TRUE(window_state->IsActive()); | 180 ASSERT_TRUE(window_state->IsActive()); |
180 SetToInitialShowState(window_state); | 181 SetToInitialShowState(window_state); |
181 EXPECT_TRUE(IsInitialShowState(window_state)); | 182 EXPECT_TRUE(IsInitialShowState(window_state)); |
182 | 183 |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 CloseAppWindow(app_window); | 308 CloseAppWindow(app_window); |
308 } | 309 } |
309 } | 310 } |
310 | 311 |
311 INSTANTIATE_TEST_CASE_P(InitiallyRestored, | 312 INSTANTIATE_TEST_CASE_P(InitiallyRestored, |
312 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 313 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
313 Values(ui::SHOW_STATE_NORMAL)); | 314 Values(ui::SHOW_STATE_NORMAL)); |
314 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, | 315 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, |
315 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 316 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
316 Values(ui::SHOW_STATE_MAXIMIZED)); | 317 Values(ui::SHOW_STATE_MAXIMIZED)); |
OLD | NEW |