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

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS 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 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 } 554 }
555 555
556 // Verify that the info bar tip is hidden when the toolbar is not visible. 556 // Verify that the info bar tip is hidden when the toolbar is not visible.
557 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, 557 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
558 InfoBarTipHiddenForWindowWithoutToolbar) { 558 InfoBarTipHiddenForWindowWithoutToolbar) {
559 ShowInfoBar(browser()); 559 ShowInfoBar(browser());
560 EXPECT_FALSE( 560 EXPECT_FALSE(
561 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]); 561 [[controller() infoBarContainerController] shouldSuppressTopInfoBarTip]);
562 562
563 OpenAppShortcutWindow(browser()->profile(), GURL("about:blank")); 563 OpenAppShortcutWindow(browser()->profile(), GURL("about:blank"));
564 Browser* popup_browser = BrowserList::GetInstance( 564 Browser* popup_browser =
565 chrome::HOST_DESKTOP_TYPE_NATIVE)->GetLastActive(); 565 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)->GetLastActive();
566 NSWindow* popupWindow = popup_browser->window()->GetNativeWindow(); 566 NSWindow* popupWindow = popup_browser->window()->GetNativeWindow();
567 BrowserWindowController* popupController = 567 BrowserWindowController* popupController =
568 [BrowserWindowController browserWindowControllerForWindow:popupWindow]; 568 [BrowserWindowController browserWindowControllerForWindow:popupWindow];
569 EXPECT_FALSE([popupController hasToolbar]); 569 EXPECT_FALSE([popupController hasToolbar]);
570 570
571 // Show infobar for controller. 571 // Show infobar for controller.
572 ShowInfoBar(popup_browser); 572 ShowInfoBar(popup_browser);
573 EXPECT_TRUE( 573 EXPECT_TRUE(
574 [[popupController infoBarContainerController] 574 [[popupController infoBarContainerController]
575 shouldSuppressTopInfoBarTip]); 575 shouldSuppressTopInfoBarTip]);
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 VerifyWindowControlsZOrder(); 629 VerifyWindowControlsZOrder();
630 [controller() removeOverlay]; 630 [controller() removeOverlay];
631 VerifyWindowControlsZOrder(); 631 VerifyWindowControlsZOrder();
632 632
633 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen, 633 // Toggle immersive fullscreen, then verify z order. In immersive fullscreen,
634 // there are no window controls. 634 // there are no window controls.
635 [controller() enterImmersiveFullscreen]; 635 [controller() enterImmersiveFullscreen];
636 [controller() exitImmersiveFullscreen]; 636 [controller() exitImmersiveFullscreen];
637 VerifyWindowControlsZOrder(); 637 VerifyWindowControlsZOrder();
638 } 638 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698