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

Side by Side Diff: chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc

Issue 2251213004: Moves ImmersiveFullscreenController::SetupForTest into test class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/views/location_bar/zoom_bubble_view.h" 5 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 9 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h" 10 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
11 #include "chrome/browser/ui/views/frame/browser_view.h" 11 #include "chrome/browser/ui/views/frame/browser_view.h"
12 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 12 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 14
15 typedef InProcessBrowserTest ZoomBubbleBrowserTest; 15 typedef InProcessBrowserTest ZoomBubbleBrowserTest;
16 16
17 #if defined(USE_ASH)
18 #include "ash/test/immersive_fullscreen_controller_test_api.h"
19 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
20 #endif
21
17 // TODO(linux_aura) http://crbug.com/163931 22 // TODO(linux_aura) http://crbug.com/163931
18 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 23 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
19 #define MAYBE_NonImmersiveFullscreen DISABLED_NonImmersiveFullscreen 24 #define MAYBE_NonImmersiveFullscreen DISABLED_NonImmersiveFullscreen
20 #else 25 #else
21 #define MAYBE_NonImmersiveFullscreen NonImmersiveFullscreen 26 #define MAYBE_NonImmersiveFullscreen NonImmersiveFullscreen
22 #endif 27 #endif
23 // Test whether the zoom bubble is anchored and whether it is visible when in 28 // Test whether the zoom bubble is anchored and whether it is visible when in
24 // non-immersive fullscreen. 29 // non-immersive fullscreen.
25 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, MAYBE_NonImmersiveFullscreen) { 30 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, MAYBE_NonImmersiveFullscreen) {
26 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); 31 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // TODO(zturner): Change this to USE_ASH after fixing the test on Windows. 72 // TODO(zturner): Change this to USE_ASH after fixing the test on Windows.
68 #if defined(OS_CHROMEOS) 73 #if defined(OS_CHROMEOS)
69 // Test whether the zoom bubble is anchored and whether it is visible when in 74 // Test whether the zoom bubble is anchored and whether it is visible when in
70 // immersive fullscreen. 75 // immersive fullscreen.
71 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, ImmersiveFullscreen) { 76 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, ImmersiveFullscreen) {
72 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); 77 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
73 content::WebContents* web_contents = browser_view->GetActiveWebContents(); 78 content::WebContents* web_contents = browser_view->GetActiveWebContents();
74 79
75 ImmersiveModeController* immersive_controller = 80 ImmersiveModeController* immersive_controller =
76 browser_view->immersive_mode_controller(); 81 browser_view->immersive_mode_controller();
77 immersive_controller->SetupForTest(); 82 ASSERT_EQ(ImmersiveModeController::Type::ASH, immersive_controller->type());
83 ash::ImmersiveFullscreenControllerTestApi(
84 static_cast<ImmersiveModeControllerAsh*>(immersive_controller)
85 ->controller())
86 .SetupForTest();
78 87
79 // Enter immersive fullscreen. 88 // Enter immersive fullscreen.
80 { 89 {
81 std::unique_ptr<FullscreenNotificationObserver> waiter( 90 std::unique_ptr<FullscreenNotificationObserver> waiter(
82 new FullscreenNotificationObserver()); 91 new FullscreenNotificationObserver());
83 chrome::ToggleFullscreenMode(browser()); 92 chrome::ToggleFullscreenMode(browser());
84 waiter->Wait(); 93 waiter->Wait();
85 } 94 }
86 ASSERT_TRUE(immersive_controller->IsEnabled()); 95 ASSERT_TRUE(immersive_controller->IsEnabled());
87 ASSERT_FALSE(immersive_controller->IsRevealed()); 96 ASSERT_FALSE(immersive_controller->IsRevealed());
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 128
120 // Exit fullscreen before ending the test for the sake of sanity. 129 // Exit fullscreen before ending the test for the sake of sanity.
121 { 130 {
122 std::unique_ptr<FullscreenNotificationObserver> waiter( 131 std::unique_ptr<FullscreenNotificationObserver> waiter(
123 new FullscreenNotificationObserver()); 132 new FullscreenNotificationObserver());
124 chrome::ToggleFullscreenMode(browser()); 133 chrome::ToggleFullscreenMode(browser());
125 waiter->Wait(); 134 waiter->Wait();
126 } 135 }
127 } 136 }
128 #endif // OS_CHROMEOS 137 #endif // OS_CHROMEOS
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698