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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
6 6
7 #import "base/mac/mac_util.h" 7 #import "base/mac/mac_util.h"
8 #include "base/mac/sdk_forward_declarations.h" 8 #include "base/mac/sdk_forward_declarations.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 15 matching lines...) Expand all
26 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" 26 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" 27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
28 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" 28 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 29 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
30 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" 30 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
31 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" 31 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
32 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" 32 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
33 #include "chrome/browser/ui/extensions/application_launch.h" 33 #include "chrome/browser/ui/extensions/application_launch.h"
34 #include "chrome/browser/ui/find_bar/find_bar.h" 34 #include "chrome/browser/ui/find_bar/find_bar.h"
35 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 35 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
36 #include "chrome/browser/ui/host_desktop.h"
36 #include "chrome/browser/ui/infobar_container_delegate.h" 37 #include "chrome/browser/ui/infobar_container_delegate.h"
37 #include "chrome/browser/ui/tabs/tab_strip_model.h" 38 #include "chrome/browser/ui/tabs/tab_strip_model.h"
38 #include "chrome/test/base/in_process_browser_test.h" 39 #include "chrome/test/base/in_process_browser_test.h"
39 #include "chrome/test/base/testing_profile.h" 40 #include "chrome/test/base/testing_profile.h"
40 #include "components/infobars/core/simple_alert_infobar_delegate.h" 41 #include "components/infobars/core/simple_alert_infobar_delegate.h"
41 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
42 #include "content/public/test/test_utils.h" 43 #include "content/public/test/test_utils.h"
43 #import "testing/gtest_mac.h" 44 #import "testing/gtest_mac.h"
44 #import "third_party/ocmock/OCMock/OCMock.h" 45 #import "third_party/ocmock/OCMock/OCMock.h"
45 #import "ui/base/cocoa/nsview_additions.h" 46 #import "ui/base/cocoa/nsview_additions.h"
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 VerifyWindowControlsZOrder(); 630 VerifyWindowControlsZOrder();
630 [controller() removeOverlay]; 631 [controller() removeOverlay];
631 VerifyWindowControlsZOrder(); 632 VerifyWindowControlsZOrder();
632 633
633 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen, 634 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen,
634 // there are no window controls. 635 // there are no window controls.
635 [controller() enterImmersiveFullscreen]; 636 [controller() enterImmersiveFullscreen];
636 [controller() exitImmersiveFullscreen]; 637 [controller() exitImmersiveFullscreen];
637 VerifyWindowControlsZOrder(); 638 VerifyWindowControlsZOrder();
638 } 639 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698