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 #include <stddef.h> | 7 #include <stddef.h> |
8 #import "base/mac/mac_util.h" | 8 #import "base/mac/mac_util.h" |
9 | 9 |
10 #include "base/mac/sdk_forward_declarations.h" | 10 #include "base/mac/sdk_forward_declarations.h" |
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 | 392 |
393 private: | 393 private: |
394 DISALLOW_COPY_AND_ASSIGN(BrowserWindowControllerTest); | 394 DISALLOW_COPY_AND_ASSIGN(BrowserWindowControllerTest); |
395 }; | 395 }; |
396 | 396 |
397 // Tests that adding the first profile moves the Lion fullscreen button over | 397 // Tests that adding the first profile moves the Lion fullscreen button over |
398 // correctly. | 398 // correctly. |
399 // DISABLED_ because it regularly times out: http://crbug.com/159002. | 399 // DISABLED_ because it regularly times out: http://crbug.com/159002. |
400 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, | 400 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, |
401 DISABLED_ProfileAvatarFullscreenButton) { | 401 DISABLED_ProfileAvatarFullscreenButton) { |
402 if (base::mac::IsOSSnowLeopard()) | |
403 return; | |
404 | |
405 // Initialize the locals. | 402 // Initialize the locals. |
406 ProfileManager* profile_manager = g_browser_process->profile_manager(); | 403 ProfileManager* profile_manager = g_browser_process->profile_manager(); |
407 ASSERT_TRUE(profile_manager); | 404 ASSERT_TRUE(profile_manager); |
408 | 405 |
409 NSWindow* window = browser()->window()->GetNativeWindow(); | 406 NSWindow* window = browser()->window()->GetNativeWindow(); |
410 ASSERT_TRUE(window); | 407 ASSERT_TRUE(window); |
411 | 408 |
412 // With only one profile, the fullscreen button should be visible, but the | 409 // With only one profile, the fullscreen button should be visible, but the |
413 // avatar button should not. | 410 // avatar button should not. |
414 EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles()); | 411 EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles()); |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 // Toggle out and back into fullscreen and verify that the toolbar is still | 714 // Toggle out and back into fullscreen and verify that the toolbar is still |
718 // hidden. | 715 // hidden. |
719 ToggleFullscreenAndWaitForNotification(); | 716 ToggleFullscreenAndWaitForNotification(); |
720 ToggleFullscreenAndWaitForNotification(); | 717 ToggleFullscreenAndWaitForNotification(); |
721 [[controller() presentationModeController] setMenuBarRevealProgress:0.0]; | 718 [[controller() presentationModeController] setMenuBarRevealProgress:0.0]; |
722 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN); | 719 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN); |
723 | 720 |
724 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR); | 721 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR); |
725 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar)); | 722 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar)); |
726 } | 723 } |
OLD | NEW |