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

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

Issue 198413003: Enable immersive fullscreen on Windows Ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix issues from previous review comment. Created 6 years, 9 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 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 "chrome/browser/ui/browser_commands.h" 7 #include "chrome/browser/ui/browser_commands.h"
8 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" 8 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
9 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" 9 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"
10 #include "chrome/browser/ui/views/frame/browser_view.h" 10 #include "chrome/browser/ui/views/frame/browser_view.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Exit fullscreen before ending the test for the sake of sanity. 56 // Exit fullscreen before ending the test for the sake of sanity.
57 { 57 {
58 scoped_ptr<FullscreenNotificationObserver> waiter( 58 scoped_ptr<FullscreenNotificationObserver> waiter(
59 new FullscreenNotificationObserver()); 59 new FullscreenNotificationObserver());
60 chrome::ToggleFullscreenMode(browser()); 60 chrome::ToggleFullscreenMode(browser());
61 waiter->Wait(); 61 waiter->Wait();
62 } 62 }
63 } 63 }
64 64
65 // Immersive fullscreen is CrOS only for now. 65 // TODO(zturner): Change this to USE_ASH after fixing the test on Windows.
66 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
67 // Test whether the zoom bubble is anchored and whether it is visible when in 67 // Test whether the zoom bubble is anchored and whether it is visible when in
68 // immersive fullscreen. 68 // immersive fullscreen.
69 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, ImmersiveFullscreen) { 69 IN_PROC_BROWSER_TEST_F(ZoomBubbleBrowserTest, ImmersiveFullscreen) {
70 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); 70 BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
71 content::WebContents* web_contents = browser_view->GetActiveWebContents(); 71 content::WebContents* web_contents = browser_view->GetActiveWebContents();
72 72
73 ImmersiveModeController* immersive_controller = 73 ImmersiveModeController* immersive_controller =
74 browser_view->immersive_mode_controller(); 74 browser_view->immersive_mode_controller();
75 immersive_controller->SetupForTest(); 75 immersive_controller->SetupForTest();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 // Exit fullscreen before ending the test for the sake of sanity. 118 // Exit fullscreen before ending the test for the sake of sanity.
119 { 119 {
120 scoped_ptr<FullscreenNotificationObserver> waiter( 120 scoped_ptr<FullscreenNotificationObserver> waiter(
121 new FullscreenNotificationObserver()); 121 new FullscreenNotificationObserver());
122 chrome::ToggleFullscreenMode(browser()); 122 chrome::ToggleFullscreenMode(browser());
123 waiter->Wait(); 123 waiter->Wait();
124 } 124 }
125 } 125 }
126 #endif // OS_CHROMEOS 126 #endif // OS_CHROMEOS
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698