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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 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 #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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 // are false. 439 // are false.
440 void VerifyFullscreenResizeFlagsAfterTransition() { 440 void VerifyFullscreenResizeFlagsAfterTransition() {
441 ASSERT_FALSE([controller() isLayoutSubviewsBlocked]); 441 ASSERT_FALSE([controller() isLayoutSubviewsBlocked]);
442 ASSERT_FALSE([controller() isActiveTabContentsControllerResizeBlocked]); 442 ASSERT_FALSE([controller() isActiveTabContentsControllerResizeBlocked]);
443 } 443 }
444 444
445 // Inserts a new tab into the tabstrip at the background. 445 // Inserts a new tab into the tabstrip at the background.
446 void AddTabAtBackground(int index, GURL url) { 446 void AddTabAtBackground(int index, GURL url) {
447 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK); 447 chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
448 params.tabstrip_index = index; 448 params.tabstrip_index = index;
449 params.disposition = NEW_BACKGROUND_TAB; 449 params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
450 chrome::Navigate(&params); 450 chrome::Navigate(&params);
451 content::WaitForLoadStopWithoutSuccessCheck(params.target_contents); 451 content::WaitForLoadStopWithoutSuccessCheck(params.target_contents);
452 } 452 }
453 453
454 private: 454 private:
455 DISALLOW_COPY_AND_ASSIGN(BrowserWindowControllerTest); 455 DISALLOW_COPY_AND_ASSIGN(BrowserWindowControllerTest);
456 }; 456 };
457 457
458 // Tests that adding the first profile moves the Lion fullscreen button over 458 // Tests that adding the first profile moves the Lion fullscreen button over
459 // correctly. 459 // correctly.
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]); 814 EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
815 [fullscreenToolbarController resetToolbarFlag]; 815 [fullscreenToolbarController resetToolbarFlag];
816 816
817 // Switch to a non-NTP tab. 817 // Switch to a non-NTP tab.
818 TabStripModel* model = browser()->tab_strip_model(); 818 TabStripModel* model = browser()->tab_strip_model();
819 model->ActivateTabAt(1, true); 819 model->ActivateTabAt(1, true);
820 ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]); 820 ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]);
821 EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]); 821 EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
822 [fullscreenToolbarController resetToolbarFlag]; 822 [fullscreenToolbarController resetToolbarFlag];
823 } 823 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698