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

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

Issue 10702030: Move fullscreen_controller* to a subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge tot Created 8 years, 5 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 | Annotate | Revision Log
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/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"
11 #include "chrome/browser/ui/fullscreen_controller.h" 11 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/test/test_navigation_observer.h" 14 #include "content/public/test/test_navigation_observer.h"
15 15
16 using content::WebContents; 16 using content::WebContents;
17 17
18 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] = 18 const char FullscreenControllerTest::kFullscreenMouseLockHTML[] =
19 "files/fullscreen_mouselock/fullscreen_mouselock.html"; 19 "files/fullscreen_mouselock/fullscreen_mouselock.html";
20 20
21 void FullscreenControllerTest::SetUpCommandLine(CommandLine* command_line) { 21 void FullscreenControllerTest::SetUpCommandLine(CommandLine* command_line) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen); 163 browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen);
164 fullscreen_observer.Wait(); 164 fullscreen_observer.Wait();
165 // Repeat ToggleFullscreenModeForTab until the correct state is entered. 165 // Repeat ToggleFullscreenModeForTab until the correct state is entered.
166 // This addresses flakiness on test bots running many fullscreen 166 // This addresses flakiness on test bots running many fullscreen
167 // tests in parallel. 167 // tests in parallel.
168 } while (retry_until_success && 168 } while (retry_until_success &&
169 browser()->window()->IsFullscreen() != enter_fullscreen); 169 browser()->window()->IsFullscreen() != enter_fullscreen);
170 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen); 170 ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
171 } 171 }
172 } 172 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_controller_test.h ('k') | chrome/browser/ui/fullscreen/fullscreen_exit_bubble.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698