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

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

Issue 1835093002: Fix flaky menubar in BrowserWindowController browser test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 PrefService* prefs = browser()->profile()->GetPrefs(); 701 PrefService* prefs = browser()->profile()->GetPrefs();
702 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar)); 702 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
703 703
704 // Toggle fullscreen and check if the toolbar is shown. 704 // Toggle fullscreen and check if the toolbar is shown.
705 ToggleFullscreenAndWaitForNotification(); 705 ToggleFullscreenAndWaitForNotification();
706 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_PRESENT); 706 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_PRESENT);
707 707
708 // Toggle the visibility of the fullscreen toolbar. Verify that the toolbar 708 // Toggle the visibility of the fullscreen toolbar. Verify that the toolbar
709 // is hidden and the preference is correctly updated. 709 // is hidden and the preference is correctly updated.
710 [[controller() presentationModeController] setToolbarFraction:0.0]; 710 [[controller() presentationModeController] setToolbarFraction:0.0];
711 [[controller() presentationModeController] setMenuBarRevealProgress:0.0];
711 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR); 712 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
712 EXPECT_FALSE(prefs->GetBoolean(prefs::kShowFullscreenToolbar)); 713 EXPECT_FALSE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
713 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN); 714 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN);
714 715
715 // Toggle out and back into fullscreen and verify that the toolbar is still 716 // Toggle out and back into fullscreen and verify that the toolbar is still
716 // hidden. 717 // hidden.
717 ToggleFullscreenAndWaitForNotification(); 718 ToggleFullscreenAndWaitForNotification();
718 ToggleFullscreenAndWaitForNotification(); 719 ToggleFullscreenAndWaitForNotification();
720 [[controller() presentationModeController] setMenuBarRevealProgress:0.0];
719 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN); 721 VerifyFullscreenToolbarVisibility(fullscreen_mac::OMNIBOX_TABS_HIDDEN);
720 722
721 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR); 723 chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
722 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar)); 724 EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
723 } 725 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698