| 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 "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" | 5 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 bool FullscreenControllerTest::IsFullscreenForBrowser() { | 38 bool FullscreenControllerTest::IsFullscreenForBrowser() { |
| 39 return browser()->fullscreen_controller()->IsFullscreenForBrowser(); | 39 return browser()->fullscreen_controller()->IsFullscreenForBrowser(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() { | 42 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() { |
| 43 return browser()->fullscreen_controller()-> | 43 return browser()->fullscreen_controller()-> |
| 44 IsWindowFullscreenForTabOrPending(); | 44 IsWindowFullscreenForTabOrPending(); |
| 45 } | 45 } |
| 46 | 46 |
| 47 bool FullscreenControllerTest::IsMouseLockPermissionRequested() { | 47 bool FullscreenControllerTest::IsMouseLockPermissionRequested() { |
| 48 FullscreenExitBubbleType type = | 48 ExclusiveAccessBubbleType type = |
| 49 browser()->fullscreen_controller()->GetFullscreenExitBubbleType(); | 49 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); |
| 50 bool mouse_lock = false; | 50 bool mouse_lock = false; |
| 51 fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); | 51 exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock); |
| 52 return mouse_lock; | 52 return mouse_lock; |
| 53 } | 53 } |
| 54 | 54 |
| 55 bool FullscreenControllerTest::IsFullscreenPermissionRequested() { | 55 bool FullscreenControllerTest::IsFullscreenPermissionRequested() { |
| 56 FullscreenExitBubbleType type = | 56 ExclusiveAccessBubbleType type = |
| 57 browser()->fullscreen_controller()->GetFullscreenExitBubbleType(); | 57 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); |
| 58 bool fullscreen = false; | 58 bool fullscreen = false; |
| 59 fullscreen_bubble::PermissionRequestedByType(type, &fullscreen, NULL); | 59 exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL); |
| 60 return fullscreen; | 60 return fullscreen; |
| 61 } | 61 } |
| 62 | 62 |
| 63 FullscreenExitBubbleType | 63 ExclusiveAccessBubbleType |
| 64 FullscreenControllerTest::GetFullscreenExitBubbleType() { | 64 FullscreenControllerTest::GetExclusiveAccessBubbleType() { |
| 65 return browser()->fullscreen_controller()->GetFullscreenExitBubbleType(); | 65 return browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { | 68 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { |
| 69 FullscreenExitBubbleType type = | 69 ExclusiveAccessBubbleType type = |
| 70 browser()->fullscreen_controller()->GetFullscreenExitBubbleType(); | 70 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); |
| 71 return type != FEB_TYPE_NONE; | 71 return type != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; |
| 72 } | 72 } |
| 73 | 73 |
| 74 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { | 74 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { |
| 75 FullscreenExitBubbleType type = | 75 ExclusiveAccessBubbleType type = |
| 76 browser()->fullscreen_controller()->GetFullscreenExitBubbleType(); | 76 browser()->fullscreen_controller()->GetExclusiveAccessBubbleType(); |
| 77 return fullscreen_bubble::ShowButtonsForType(type); | 77 return exclusive_access_bubble::ShowButtonsForType(type); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { | 80 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { |
| 81 browser()->fullscreen_controller()->OnAcceptFullscreenPermission(); | 81 browser()->fullscreen_controller()->OnAcceptFullscreenPermission(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() { | 84 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() { |
| 85 browser()->fullscreen_controller()->OnDenyFullscreenPermission(); | 85 browser()->fullscreen_controller()->OnDenyFullscreenPermission(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void FullscreenControllerTest::GoBack() { | 88 void FullscreenControllerTest::GoBack() { |
| 89 content::TestNavigationObserver observer( | 89 content::TestNavigationObserver observer( |
| 90 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 90 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
| 91 chrome::GoBack(browser(), CURRENT_TAB); | 91 chrome::GoBack(browser(), CURRENT_TAB); |
| 92 observer.Wait(); | 92 observer.Wait(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void FullscreenControllerTest::Reload() { | 95 void FullscreenControllerTest::Reload() { |
| 96 content::TestNavigationObserver observer( | 96 content::TestNavigationObserver observer( |
| 97 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 97 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
| 98 chrome::Reload(browser(), CURRENT_TAB); | 98 chrome::Reload(browser(), CURRENT_TAB); |
| 99 observer.Wait(); | 99 observer.Wait(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { | 102 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { |
| 103 browser()->fullscreen_controller()-> | 103 browser()->fullscreen_controller()-> |
| 104 SetPrivilegedFullscreenForTesting(is_privileged); | 104 SetPrivilegedFullscreenForTesting(is_privileged); |
| 105 } | 105 } |
| OLD | NEW |