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/exclusive_access/fullscreen_controller_test.h" | 5 #include "chrome/browser/ui/exclusive_access/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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 return GetExclusiveAccessManager()->GetExclusiveAccessExitBubbleType(); | 64 return GetExclusiveAccessManager()->GetExclusiveAccessExitBubbleType(); |
65 } | 65 } |
66 | 66 |
67 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { | 67 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() { |
68 return GetExclusiveAccessBubbleType() != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; | 68 return GetExclusiveAccessBubbleType() != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE; |
69 } | 69 } |
70 | 70 |
71 void FullscreenControllerTest::GoBack() { | 71 void FullscreenControllerTest::GoBack() { |
72 content::TestNavigationObserver observer( | 72 content::TestNavigationObserver observer( |
73 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 73 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
74 chrome::GoBack(browser(), CURRENT_TAB); | 74 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); |
75 observer.Wait(); | 75 observer.Wait(); |
76 } | 76 } |
77 | 77 |
78 void FullscreenControllerTest::Reload() { | 78 void FullscreenControllerTest::Reload() { |
79 content::TestNavigationObserver observer( | 79 content::TestNavigationObserver observer( |
80 browser()->tab_strip_model()->GetActiveWebContents(), 1); | 80 browser()->tab_strip_model()->GetActiveWebContents(), 1); |
81 chrome::Reload(browser(), CURRENT_TAB); | 81 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
82 observer.Wait(); | 82 observer.Wait(); |
83 } | 83 } |
84 | 84 |
85 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { | 85 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { |
86 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged); | 86 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged); |
87 } | 87 } |
OLD | NEW |