| 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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
| 9 #include "chrome/browser/ui/browser_tabstrip.h" | 9 #include "chrome/browser/ui/browser_tabstrip.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" | 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
| 15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 16 #include "content/public/common/url_constants.h" | 16 #include "content/public/common/url_constants.h" |
| 17 #include "content/public/test/test_navigation_observer.h" | 17 #include "content/public/test/test_navigation_observer.h" |
| 18 #if defined(OS_MACOSX) | |
| 19 #include "base/mac/mac_util.h" | |
| 20 #endif | |
| 21 | 18 |
| 22 using url::kAboutBlankURL; | 19 using url::kAboutBlankURL; |
| 23 using content::WebContents; | 20 using content::WebContents; |
| 24 using ui::PAGE_TRANSITION_TYPED; | 21 using ui::PAGE_TRANSITION_TYPED; |
| 25 | 22 |
| 26 class FullscreenControllerBrowserTest: public FullscreenControllerTest { | 23 class FullscreenControllerBrowserTest: public FullscreenControllerTest { |
| 27 }; | 24 }; |
| 28 | 25 |
| 29 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | 26 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, |
| 30 PendingMouseLockExitsOnTabSwitch) { | 27 PendingMouseLockExitsOnTabSwitch) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 67 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 71 | 68 |
| 72 // Close tab. Bubble is cleared. | 69 // Close tab. Bubble is cleared. |
| 73 { | 70 { |
| 74 MouseLockNotificationObserver mouse_lock_observer; | 71 MouseLockNotificationObserver mouse_lock_observer; |
| 75 chrome::CloseTab(browser()); | 72 chrome::CloseTab(browser()); |
| 76 mouse_lock_observer.Wait(); | 73 mouse_lock_observer.Wait(); |
| 77 } | 74 } |
| 78 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 75 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 79 } | 76 } |
| OLD | NEW |