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

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

Issue 687903003: Cleanup: Remove unneeded ui_test_utils.h includes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix cros Created 6 years, 1 month 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 "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"
11 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" 11 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "chrome/test/base/ui_test_utils.h"
14 13
15 typedef InProcessBrowserTest ZoomBubbleBrowserTest; 14 typedef InProcessBrowserTest ZoomBubbleBrowserTest;
16 15
17 // TODO(linux_aura) http://crbug.com/163931 16 // TODO(linux_aura) http://crbug.com/163931
18 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) 17 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
19 #define MAYBE_NonImmersiveFullscreen DISABLED_NonImmersiveFullscreen 18 #define MAYBE_NonImmersiveFullscreen DISABLED_NonImmersiveFullscreen
20 #else 19 #else
21 #define MAYBE_NonImmersiveFullscreen NonImmersiveFullscreen 20 #define MAYBE_NonImmersiveFullscreen NonImmersiveFullscreen
22 #endif 21 #endif
23 // Test whether the zoom bubble is anchored and whether it is visible when in 22 // Test whether the zoom bubble is anchored and whether it is visible when in
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 116
118 // Exit fullscreen before ending the test for the sake of sanity. 117 // Exit fullscreen before ending the test for the sake of sanity.
119 { 118 {
120 scoped_ptr<FullscreenNotificationObserver> waiter( 119 scoped_ptr<FullscreenNotificationObserver> waiter(
121 new FullscreenNotificationObserver()); 120 new FullscreenNotificationObserver());
122 chrome::ToggleFullscreenMode(browser()); 121 chrome::ToggleFullscreenMode(browser());
123 waiter->Wait(); 122 waiter->Wait();
124 } 123 }
125 } 124 }
126 #endif // OS_CHROMEOS 125 #endif // OS_CHROMEOS
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698