| 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/fullscreen/fullscreen_controller.h" | 11 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" |
| 12 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" | 12 #include "chrome/browser/ui/fullscreen/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 "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "content/public/browser/render_view_host.h" | 15 #include "content/public/browser/render_view_host.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/url_constants.h" | 17 #include "content/public/common/url_constants.h" |
| 18 #include "content/public/test/test_navigation_observer.h" | 18 #include "content/public/test/test_navigation_observer.h" |
| 19 #if defined(OS_MACOSX) | 19 #if defined(OS_MACOSX) |
| 20 #include "base/mac/mac_util.h" | 20 #include "base/mac/mac_util.h" |
| 21 #endif | 21 #endif |
| 22 | 22 |
| 23 using content::kAboutBlankURL; | 23 using url::kAboutBlankURL; |
| 24 using content::WebContents; | 24 using content::WebContents; |
| 25 using content::PAGE_TRANSITION_TYPED; | 25 using content::PAGE_TRANSITION_TYPED; |
| 26 | 26 |
| 27 class FullscreenControllerBrowserTest: public FullscreenControllerTest { | 27 class FullscreenControllerBrowserTest: public FullscreenControllerTest { |
| 28 }; | 28 }; |
| 29 | 29 |
| 30 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | 30 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, |
| 31 PendingMouseLockExitsOnTabSwitch) { | 31 PendingMouseLockExitsOnTabSwitch) { |
| 32 AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); | 32 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 33 AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); | 33 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 34 WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents(); | 34 WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents(); |
| 35 | 35 |
| 36 // Request mouse lock. Bubble is displayed. | 36 // Request mouse lock. Bubble is displayed. |
| 37 RequestToLockMouse(true, false); | 37 RequestToLockMouse(true, false); |
| 38 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 38 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 39 | 39 |
| 40 // Activate current tab. Mouse lock bubble remains. | 40 // Activate current tab. Mouse lock bubble remains. |
| 41 browser()->tab_strip_model()->ActivateTabAt(0, true); | 41 browser()->tab_strip_model()->ActivateTabAt(0, true); |
| 42 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 42 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 43 | 43 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 56 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 56 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 57 | 57 |
| 58 // Close first tab while second active. Mouse lock bubble remains. | 58 // Close first tab while second active. Mouse lock bubble remains. |
| 59 chrome::CloseWebContents(browser(), tab1, false); | 59 chrome::CloseWebContents(browser(), tab1, false); |
| 60 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 60 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 61 } | 61 } |
| 62 | 62 |
| 63 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, | 63 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, |
| 64 PendingMouseLockExitsOnTabClose) { | 64 PendingMouseLockExitsOnTabClose) { |
| 65 // Add more tabs. | 65 // Add more tabs. |
| 66 AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); | 66 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 67 AddTabAtIndex(0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED); | 67 AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED); |
| 68 | 68 |
| 69 // Request mouse lock. Bubble is displayed. | 69 // Request mouse lock. Bubble is displayed. |
| 70 RequestToLockMouse(true, false); | 70 RequestToLockMouse(true, false); |
| 71 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); | 71 ASSERT_TRUE(IsFullscreenBubbleDisplayed()); |
| 72 | 72 |
| 73 // Close tab. Bubble is cleared. | 73 // Close tab. Bubble is cleared. |
| 74 { | 74 { |
| 75 MouseLockNotificationObserver mouse_lock_observer; | 75 MouseLockNotificationObserver mouse_lock_observer; |
| 76 chrome::CloseTab(browser()); | 76 chrome::CloseTab(browser()); |
| 77 mouse_lock_observer.Wait(); | 77 mouse_lock_observer.Wait(); |
| 78 } | 78 } |
| 79 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); | 79 ASSERT_FALSE(IsFullscreenBubbleDisplayed()); |
| 80 } | 80 } |
| OLD | NEW |