Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1423)

Side by Side Diff: chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc

Issue 1570443008: Fix FullscreenController tests with simplified-fullscreen-ui flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: FullscreenControllerInteractiveTest: Further fixes for ChromeOS-only tests. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
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/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "content/public/browser/native_web_keyboard_event.h" 14 #include "content/public/browser/native_web_keyboard_event.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/test/test_navigation_observer.h" 16 #include "content/public/test/test_navigation_observer.h"
17 #include "ui/events/keycodes/keyboard_codes.h" 17 #include "ui/events/keycodes/keyboard_codes.h"
18 18
19 using content::WebContents; 19 using content::WebContents;
20 20
21 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = 21 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] =
22 "/fullscreen_mouselock/fullscreen_mouselock.html"; 22 "/fullscreen_mouselock/fullscreen_mouselock.html";
23 23
24 void FullscreenControllerTest::RequestToLockMouse( 24 void FullscreenControllerTest::RequestToLockMouse(
25 bool user_gesture, 25 bool user_gesture,
26 bool last_unlocked_by_target) { 26 bool last_unlocked_by_target) {
27 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 27 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
28 MouseLockController* mouse_lock_controller =
29 GetExclusiveAccessManager()->mouse_lock_controller();
30 mouse_lock_controller->set_fake_mouse_lock_for_test(true);
28 browser()->RequestToLockMouse(tab, user_gesture, 31 browser()->RequestToLockMouse(tab, user_gesture,
29 last_unlocked_by_target); 32 last_unlocked_by_target);
33 mouse_lock_controller->set_fake_mouse_lock_for_test(false);
30 } 34 }
31 35
32 FullscreenController* FullscreenControllerTest::GetFullscreenController() { 36 FullscreenController* FullscreenControllerTest::GetFullscreenController() {
33 return GetExclusiveAccessManager()->fullscreen_controller(); 37 return GetExclusiveAccessManager()->fullscreen_controller();
34 } 38 }
35 39
36 ExclusiveAccessManager* FullscreenControllerTest::GetExclusiveAccessManager() { 40 ExclusiveAccessManager* FullscreenControllerTest::GetExclusiveAccessManager() {
37 return browser()->exclusive_access_manager(); 41 return browser()->exclusive_access_manager();
38 } 42 }
39 43
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 void FullscreenControllerTest::Reload() { 105 void FullscreenControllerTest::Reload() {
102 content::TestNavigationObserver observer( 106 content::TestNavigationObserver observer(
103 browser()->tab_strip_model()->GetActiveWebContents(), 1); 107 browser()->tab_strip_model()->GetActiveWebContents(), 1);
104 chrome::Reload(browser(), CURRENT_TAB); 108 chrome::Reload(browser(), CURRENT_TAB);
105 observer.Wait(); 109 observer.Wait();
106 } 110 }
107 111
108 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) { 112 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) {
109 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged); 113 GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged);
110 } 114 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698