| OLD | NEW |
| 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" |
| 11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
| 12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/devtools/devtools_window_testing.h" | 13 #include "chrome/browser/devtools/devtools_window_testing.h" |
| 14 #include "chrome/browser/infobars/infobar_service.h" | 14 #include "chrome/browser/infobars/infobar_service.h" |
| 15 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h" | |
| 16 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/profiles/profile_manager.h" | 16 #include "chrome/browser/profiles/profile_manager.h" |
| 18 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 17 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
| 19 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_commands.h" | 19 #include "chrome/browser/ui/browser_commands.h" |
| 21 #include "chrome/browser/ui/browser_list.h" | 20 #include "chrome/browser/ui/browser_list.h" |
| 22 #include "chrome/browser/ui/browser_window.h" | 21 #include "chrome/browser/ui/browser_window.h" |
| 23 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" | 22 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" |
| 24 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" | 23 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" |
| 25 #import "chrome/browser/ui/cocoa/fast_resize_view.h" | 24 #import "chrome/browser/ui/cocoa/fast_resize_view.h" |
| 26 #import "chrome/browser/ui/cocoa/history_overlay_controller.h" | 25 #import "chrome/browser/ui/cocoa/history_overlay_controller.h" |
| 27 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" | 26 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" |
| 28 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" | 27 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h" |
| 29 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" | 28 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" |
| 30 #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" |
| 31 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" | 30 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h" |
| 32 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" | 31 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h" |
| 33 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" | 32 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" |
| 34 #include "chrome/browser/ui/extensions/application_launch.h" | 33 #include "chrome/browser/ui/extensions/application_launch.h" |
| 35 #include "chrome/browser/ui/find_bar/find_bar.h" | 34 #include "chrome/browser/ui/find_bar/find_bar.h" |
| 36 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 35 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
| 37 #include "chrome/browser/ui/infobar_container_delegate.h" | 36 #include "chrome/browser/ui/infobar_container_delegate.h" |
| 38 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 37 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 39 #include "chrome/test/base/in_process_browser_test.h" | 38 #include "chrome/test/base/in_process_browser_test.h" |
| 40 #include "chrome/test/base/testing_profile.h" | 39 #include "chrome/test/base/testing_profile.h" |
| 40 #include "components/infobars/core/simple_alert_infobar_delegate.h" |
| 41 #include "content/public/browser/web_contents.h" | 41 #include "content/public/browser/web_contents.h" |
| 42 #include "content/public/test/test_utils.h" | 42 #include "content/public/test/test_utils.h" |
| 43 #import "testing/gtest_mac.h" | 43 #import "testing/gtest_mac.h" |
| 44 #import "third_party/ocmock/OCMock/OCMock.h" | 44 #import "third_party/ocmock/OCMock/OCMock.h" |
| 45 #import "ui/base/cocoa/nsview_additions.h" | 45 #import "ui/base/cocoa/nsview_additions.h" |
| 46 #include "ui/gfx/animation/slide_animation.h" | 46 #include "ui/gfx/animation/slide_animation.h" |
| 47 | 47 |
| 48 namespace { | 48 namespace { |
| 49 | 49 |
| 50 // Creates a mock of an NSWindow that has the given |frame|. | 50 // Creates a mock of an NSWindow that has the given |frame|. |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 VerifyWindowControlsZOrder(); | 630 VerifyWindowControlsZOrder(); |
| 631 [controller() removeOverlay]; | 631 [controller() removeOverlay]; |
| 632 VerifyWindowControlsZOrder(); | 632 VerifyWindowControlsZOrder(); |
| 633 | 633 |
| 634 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen, | 634 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen, |
| 635 // there are no window controls. | 635 // there are no window controls. |
| 636 [controller() enterImmersiveFullscreen]; | 636 [controller() enterImmersiveFullscreen]; |
| 637 [controller() exitImmersiveFullscreen]; | 637 [controller() exitImmersiveFullscreen]; |
| 638 VerifyWindowControlsZOrder(); | 638 VerifyWindowControlsZOrder(); |
| 639 } | 639 } |
| OLD | NEW |