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/accelerators/accelerator_commands.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
6 | 6 |
7 #include "apps/app_window.h" | 7 #include "apps/app_window.h" |
8 #include "apps/ui/native_app_window.h" | 8 #include "apps/ui/native_app_window.h" |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 ash::accelerators::ToggleFullscreen(); | 159 ash::accelerators::ToggleFullscreen(); |
160 EXPECT_TRUE(IsInitialShowState(window_state)); | 160 EXPECT_TRUE(IsInitialShowState(window_state)); |
161 | 161 |
162 // 2) ToggleFullscreen() should have no effect on windows which cannot be | 162 // 2) ToggleFullscreen() should have no effect on windows which cannot be |
163 // maximized. | 163 // maximized. |
164 window_state->window()->SetProperty(aura::client::kCanMaximizeKey, false); | 164 window_state->window()->SetProperty(aura::client::kCanMaximizeKey, false); |
165 ash::accelerators::ToggleFullscreen(); | 165 ash::accelerators::ToggleFullscreen(); |
166 EXPECT_TRUE(IsInitialShowState(window_state)); | 166 EXPECT_TRUE(IsInitialShowState(window_state)); |
167 | 167 |
168 // 3) Hosted apps. | 168 // 3) Hosted apps. |
169 Browser::CreateParams browser_create_params(Browser::TYPE_POPUP, | 169 Browser::CreateParams browser_create_params( |
170 browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH); | 170 Browser::CreateParams::CreateForApp( |
171 browser_create_params.app_name = "Test"; | 171 Browser::TYPE_TRUSTED_POPUP, "Test", gfx::Rect(), |
| 172 browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH)); |
172 | 173 |
173 Browser* app_host_browser = new Browser(browser_create_params); | 174 Browser* app_host_browser = new Browser(browser_create_params); |
174 ASSERT_TRUE(app_host_browser->is_app()); | 175 ASSERT_TRUE(app_host_browser->is_app()); |
175 AddBlankTabAndShow(app_host_browser); | 176 AddBlankTabAndShow(app_host_browser); |
176 window_state = | 177 window_state = |
177 ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow()); | 178 ash::wm::GetWindowState(app_host_browser->window()->GetNativeWindow()); |
178 ASSERT_TRUE(window_state->IsActive()); | 179 ASSERT_TRUE(window_state->IsActive()); |
179 SetToInitialShowState(window_state); | 180 SetToInitialShowState(window_state); |
180 EXPECT_TRUE(IsInitialShowState(window_state)); | 181 EXPECT_TRUE(IsInitialShowState(window_state)); |
181 | 182 |
182 ash::accelerators::ToggleFullscreen(); | 183 ash::accelerators::ToggleFullscreen(); |
183 EXPECT_TRUE(window_state->IsFullscreen()); | 184 EXPECT_TRUE(window_state->IsFullscreen()); |
184 EXPECT_EQ(put_window_in_immersive(), IsInImmersiveFullscreen(window_state)); | 185 EXPECT_EQ(put_window_in_immersive(), IsInImmersiveFullscreen(window_state)); |
185 | 186 |
186 ash::accelerators::ToggleFullscreen(); | 187 ash::accelerators::ToggleFullscreen(); |
187 EXPECT_TRUE(IsInitialShowState(window_state)); | 188 EXPECT_TRUE(IsInitialShowState(window_state)); |
188 | 189 |
189 // 4) Popup browser windows. | 190 // 4) Popup browser windows. |
190 browser_create_params.app_name = ""; | 191 browser_create_params = Browser::CreateParams( |
| 192 Browser::TYPE_POPUP, browser()->profile(), chrome::HOST_DESKTOP_TYPE_ASH); |
191 Browser* popup_browser = new Browser(browser_create_params); | 193 Browser* popup_browser = new Browser(browser_create_params); |
192 ASSERT_TRUE(popup_browser->is_type_popup()); | 194 ASSERT_TRUE(popup_browser->is_type_popup()); |
193 ASSERT_FALSE(popup_browser->is_app()); | 195 ASSERT_FALSE(popup_browser->is_app()); |
194 AddBlankTabAndShow(popup_browser); | 196 AddBlankTabAndShow(popup_browser); |
195 window_state = | 197 window_state = |
196 ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow()); | 198 ash::wm::GetWindowState(popup_browser->window()->GetNativeWindow()); |
197 ASSERT_TRUE(window_state->IsActive()); | 199 ASSERT_TRUE(window_state->IsActive()); |
198 SetToInitialShowState(window_state); | 200 SetToInitialShowState(window_state); |
199 EXPECT_TRUE(IsInitialShowState(window_state)); | 201 EXPECT_TRUE(IsInitialShowState(window_state)); |
200 | 202 |
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 CloseAppWindow(app_window); | 339 CloseAppWindow(app_window); |
338 } | 340 } |
339 } | 341 } |
340 | 342 |
341 INSTANTIATE_TEST_CASE_P(InitiallyRestored, | 343 INSTANTIATE_TEST_CASE_P(InitiallyRestored, |
342 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 344 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
343 Values(ui::SHOW_STATE_NORMAL)); | 345 Values(ui::SHOW_STATE_NORMAL)); |
344 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, | 346 INSTANTIATE_TEST_CASE_P(InitiallyMaximized, |
345 AcceleratorCommandsPlatformAppFullscreenBrowserTest, | 347 AcceleratorCommandsPlatformAppFullscreenBrowserTest, |
346 Values(ui::SHOW_STATE_MAXIMIZED)); | 348 Values(ui::SHOW_STATE_MAXIMIZED)); |
OLD | NEW |