| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 7 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
| 8 #include "chrome/browser/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 } | 189 } |
| 190 | 190 |
| 191 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, | 191 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, |
| 192 MAYBE_UpdateWindowSizeExitsFullscreen) { | 192 MAYBE_UpdateWindowSizeExitsFullscreen) { |
| 193 browser()->window()->EnterFullscreen( | 193 browser()->window()->EnterFullscreen( |
| 194 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); | 194 GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION); |
| 195 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; | 195 ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_; |
| 196 ASSERT_FALSE(browser()->window()->IsFullscreen()); | 196 ASSERT_FALSE(browser()->window()->IsFullscreen()); |
| 197 } | 197 } |
| 198 | 198 |
| 199 #if defined(OS_WIN) | 199 #if defined(OS_WIN) && !defined(USE_AURA) |
| 200 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FocusWindowDoesNotUnmaximize) { | 200 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FocusWindowDoesNotUnmaximize) { |
| 201 gfx::NativeWindow window = browser()->window()->GetNativeHandle(); | 201 gfx::NativeWindow window = browser()->window()->GetNativeHandle(); |
| 202 ::SendMessage(window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); | 202 ::SendMessage(window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); |
| 203 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; | 203 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; |
| 204 ASSERT_TRUE(::IsZoomed(window)); | 204 ASSERT_TRUE(::IsZoomed(window)); |
| 205 } | 205 } |
| 206 #endif // OS_WIN | 206 #endif // OS_WIN |
| 207 | 207 |
| 208 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { | 208 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { |
| 209 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), | 209 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), |
| (...skipping 10 matching lines...) Expand all Loading... |
| 220 } | 220 } |
| 221 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) { | 221 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_GetViewsOfCreatedWindow) { |
| 222 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) | 222 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) |
| 223 << message_; | 223 << message_; |
| 224 } | 224 } |
| 225 | 225 |
| 226 // Adding a new test? Awesome. But API tests are the old hotness. The | 226 // Adding a new test? Awesome. But API tests are the old hotness. The |
| 227 // new hotness is extension_test_utils. See extension_tabs_test.cc for | 227 // new hotness is extension_test_utils. See extension_tabs_test.cc for |
| 228 // an example. We are trying to phase out many uses of API tests as | 228 // an example. We are trying to phase out many uses of API tests as |
| 229 // they tend to be flaky. | 229 // they tend to be flaky. |
| OLD | NEW |