| 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" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 } | 85 } |
| 86 return NO; | 86 return NO; |
| 87 } | 87 } |
| 88 @end | 88 @end |
| 89 | 89 |
| 90 class BrowserWindowControllerTest : public InProcessBrowserTest { | 90 class BrowserWindowControllerTest : public InProcessBrowserTest { |
| 91 public: | 91 public: |
| 92 BrowserWindowControllerTest() : InProcessBrowserTest() { | 92 BrowserWindowControllerTest() : InProcessBrowserTest() { |
| 93 } | 93 } |
| 94 | 94 |
| 95 virtual void SetUpOnMainThread() OVERRIDE { | 95 virtual void SetUpOnMainThread() override { |
| 96 [[controller() bookmarkBarController] setStateAnimationsEnabled:NO]; | 96 [[controller() bookmarkBarController] setStateAnimationsEnabled:NO]; |
| 97 [[controller() bookmarkBarController] setInnerContentAnimationsEnabled:NO]; | 97 [[controller() bookmarkBarController] setInnerContentAnimationsEnabled:NO]; |
| 98 } | 98 } |
| 99 | 99 |
| 100 BrowserWindowController* controller() const { | 100 BrowserWindowController* controller() const { |
| 101 return [BrowserWindowController browserWindowControllerForWindow: | 101 return [BrowserWindowController browserWindowControllerForWindow: |
| 102 browser()->window()->GetNativeWindow()]; | 102 browser()->window()->GetNativeWindow()]; |
| 103 } | 103 } |
| 104 | 104 |
| 105 static void ShowInfoBar(Browser* browser) { | 105 static void ShowInfoBar(Browser* browser) { |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 // Toggle overlay, then verify z order. | 505 // Toggle overlay, then verify z order. |
| 506 [controller() showOverlay]; | 506 [controller() showOverlay]; |
| 507 [controller() removeOverlay]; | 507 [controller() removeOverlay]; |
| 508 VerifyTrafficLightZOrder(); | 508 VerifyTrafficLightZOrder(); |
| 509 | 509 |
| 510 // Toggle immersive fullscreen, then verify z order. | 510 // Toggle immersive fullscreen, then verify z order. |
| 511 [controller() enterImmersiveFullscreen]; | 511 [controller() enterImmersiveFullscreen]; |
| 512 [controller() exitImmersiveFullscreen]; | 512 [controller() exitImmersiveFullscreen]; |
| 513 VerifyTrafficLightZOrder(); | 513 VerifyTrafficLightZOrder(); |
| 514 } | 514 } |
| OLD | NEW |