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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/browser_navigator_browsertest.cc

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, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator_browsertest.cc
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index efae8f10f1bc73365fd7528efb12e56b488a7aa8..dad1b0abd7867894a77f816ba630c5b8fab44d8e 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -92,7 +92,7 @@ bool BrowserNavigatorTest::OpenPOSTURLInNewForegroundTabAndGetTitle(
const GURL& url, const std::string& post_data, bool is_browser_initiated,
base::string16* title) {
chrome::NavigateParams param(MakeNavigateParams());
- param.disposition = NEW_FOREGROUND_TAB;
+ param.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
param.url = url;
param.is_renderer_initiated = !is_browser_initiated;
param.uses_post = true;
@@ -164,7 +164,7 @@ void BrowserNavigatorTest::RunUseNonIncognitoWindowTest(const GURL& url) {
// Navigate to the page.
chrome::NavigateParams params(MakeNavigateParams(incognito_browser));
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = url;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(&params);
@@ -191,7 +191,7 @@ void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest(
// Navigate to the page.
chrome::NavigateParams params(MakeNavigateParams(browser));
- params.disposition = OFF_THE_RECORD;
+ params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
params.url = url;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(&params);
@@ -262,7 +262,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) {
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url1;
chrome::Navigate(&params);
@@ -291,7 +291,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url2.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_ref_url2;
chrome::Navigate(&params);
@@ -302,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url2, but with respect ref set.
params = MakeNavigateParams();
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_ref_url2;
params.ref_behavior = chrome::NavigateParams::RESPECT_REF;
chrome::Navigate(&params);
@@ -314,7 +314,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url3.
params = MakeNavigateParams();
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_ref_url3;
params.ref_behavior = chrome::NavigateParams::RESPECT_REF;
chrome::Navigate(&params);
@@ -335,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url1;
chrome::Navigate(&params);
@@ -352,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewForegroundTab) {
WebContents* old_contents =
browser()->tab_strip_model()->GetActiveWebContents();
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
EXPECT_NE(old_contents,
browser()->tab_strip_model()->GetActiveWebContents());
@@ -367,7 +367,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewBackgroundTab) {
WebContents* old_contents =
browser()->tab_strip_model()->GetActiveWebContents();
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_BACKGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
chrome::Navigate(&params);
WebContents* new_contents =
browser()->tab_strip_model()->GetActiveWebContents();
@@ -387,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
Browser* popup = CreateEmptyBrowserForType(Browser::TYPE_POPUP,
browser()->profile());
chrome::NavigateParams params(MakeNavigateParams(popup));
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
// Navigate() should have opened the tab in a different browser since the
@@ -420,7 +420,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
Browser::TYPE_POPUP,
browser()->profile()->GetOffTheRecordProfile());
chrome::NavigateParams params(MakeNavigateParams(popup));
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(&params);
// Navigate() should have opened the tab in a different browser since the
@@ -446,7 +446,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// from a normal Browser results in a new Browser with TYPE_POPUP.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_bounds = gfx::Rect(0, 0, 200, 200);
// Wait for new popup to to load and gain focus.
ui_test_utils::NavigateToURL(&params);
@@ -471,7 +471,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup) {
// from a normal Browser results in a new Browser with is_app() true.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup_ExtensionId) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.extension_app_id = "extensionappid";
params.window_bounds = gfx::Rect(0, 0, 200, 200);
// Wait for new popup to to load and gain focus.
@@ -494,12 +494,12 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup_ExtensionId) {
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupFromPopup) {
// Open a popup.
chrome::NavigateParams params1(MakeNavigateParams());
- params1.disposition = NEW_POPUP;
+ params1.disposition = WindowOpenDisposition::NEW_POPUP;
params1.window_bounds = gfx::Rect(0, 0, 200, 200);
chrome::Navigate(&params1);
// Open another popup.
chrome::NavigateParams params2(MakeNavigateParams(params1.browser));
- params2.disposition = NEW_POPUP;
+ params2.disposition = WindowOpenDisposition::NEW_POPUP;
params2.window_bounds = gfx::Rect(0, 0, 200, 200);
chrome::Navigate(&params2);
@@ -522,7 +522,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
Disposition_NewPopupFromAppWindow) {
Browser* app_browser = CreateEmptyBrowserForApp(browser()->profile());
chrome::NavigateParams params(MakeNavigateParams(app_browser));
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_bounds = gfx::Rect(0, 0, 200, 200);
chrome::Navigate(&params);
@@ -547,12 +547,12 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
Browser* app_browser = CreateEmptyBrowserForApp(browser()->profile());
// Open an app popup.
chrome::NavigateParams params1(MakeNavigateParams(app_browser));
- params1.disposition = NEW_POPUP;
+ params1.disposition = WindowOpenDisposition::NEW_POPUP;
params1.window_bounds = gfx::Rect(0, 0, 200, 200);
chrome::Navigate(&params1);
// Now open another app popup.
chrome::NavigateParams params2(MakeNavigateParams(params1.browser));
- params2.disposition = NEW_POPUP;
+ params2.disposition = WindowOpenDisposition::NEW_POPUP;
params2.window_bounds = gfx::Rect(0, 0, 200, 200);
chrome::Navigate(&params2);
@@ -582,7 +582,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// does not focus a new new popup window.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupUnfocused) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_bounds = gfx::Rect(0, 0, 200, 200);
params.window_action = chrome::NavigateParams::SHOW_WINDOW_INACTIVE;
// Wait for new popup to load (and gain focus if the test fails).
@@ -602,7 +602,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupUnfocused) {
// is true.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupTrusted) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.trusted_source = true;
params.window_bounds = gfx::Rect(0, 0, 200, 200);
// Wait for new popup to to load and gain focus.
@@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupTrusted) {
// always opens a new window.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewWindow) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_WINDOW;
+ params.disposition = WindowOpenDisposition::NEW_WINDOW;
chrome::Navigate(&params);
// Navigate() should have opened a new toplevel window.
@@ -637,7 +637,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewWindow) {
// opens a new incognito window if no existing incognito window is present.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_Incognito) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = OFF_THE_RECORD;
+ params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
chrome::Navigate(&params);
// Navigate() should have opened a new toplevel incognito window.
@@ -663,7 +663,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_IncognitoRefocus) {
CreateEmptyBrowserForType(Browser::TYPE_TABBED,
browser()->profile()->GetOffTheRecordProfile());
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = OFF_THE_RECORD;
+ params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
chrome::Navigate(&params);
// Navigate() should have opened a new tab in the existing incognito window.
@@ -680,19 +680,19 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_IncognitoRefocus) {
// This test verifies that no navigation action occurs when
// WindowOpenDisposition = SAVE_TO_DISK.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SaveToDisk) {
- RunSuppressTest(SAVE_TO_DISK);
+ RunSuppressTest(WindowOpenDisposition::SAVE_TO_DISK);
}
// This test verifies that no navigation action occurs when
// WindowOpenDisposition = IGNORE_ACTION.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_IgnoreAction) {
- RunSuppressTest(IGNORE_ACTION);
+ RunSuppressTest(WindowOpenDisposition::IGNORE_ACTION);
}
// This tests adding a foreground tab with a predefined WebContents.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, TargetContents_ForegroundTab) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.target_contents = CreateWebContents(false);
chrome::Navigate(&params);
@@ -711,7 +711,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, TargetContents_ForegroundTab) {
// This tests adding a popup with a predefined WebContents.
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, DISABLED_TargetContents_Popup) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.target_contents = CreateWebContents(false);
params.window_bounds = gfx::Rect(10, 10, 500, 500);
chrome::Navigate(&params);
@@ -751,7 +751,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, DISABLED_TargetContents_Popup) {
IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
CreateWebContentsWithRendererProcess) {
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.target_contents = CreateWebContents(true);
ASSERT_TRUE(params.target_contents);
@@ -793,7 +793,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Tabstrip_InsertAtIndex) {
// covered by the unit tests for TabStripModel. This merely verifies that
// insertion index preference is reflected in common cases.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.tabstrip_index = 0;
params.tabstrip_add_types = TabStripModel::ADD_FORCE_INDEX;
chrome::Navigate(&params);
@@ -823,7 +823,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to a new singleton tab with a sub-page.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = GetContentSettingsURL();
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -857,7 +857,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = GetContentSettingsURL();
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -891,7 +891,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = GetClearBrowsingDataURL();
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -925,7 +925,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = GetClearBrowsingDataURL();
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_STAY_PUT;
@@ -957,7 +957,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to a different settings path.
GURL singleton_url_target(GetClearBrowsingDataURL());
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url_target;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -990,7 +990,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
"chrome://settings/internet?"
"guid=ethernet_00aa00aa00aa&networkType=1");
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url_target;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -1039,7 +1039,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
DISABLED_Disposition_Settings_UseNonIncognitoWindowForBookmark) {
chrome::NavigateParams params(browser(), GetSettingsURL(),
ui::PAGE_TRANSITION_AUTO_BOOKMARK);
- params.disposition = OFF_THE_RECORD;
+ params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
{
content::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
@@ -1098,7 +1098,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
EXPECT_TRUE(web_contents->IsCrashed());
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -1376,7 +1376,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ViewSourceIsntSingleton) {
chrome::NavigateParams singleton_params(browser(),
GURL(chrome::kChromeUIVersionURL),
ui::PAGE_TRANSITION_LINK);
- singleton_params.disposition = SINGLETON_TAB;
+ singleton_params.disposition = WindowOpenDisposition::SINGLETON_TAB;
EXPECT_EQ(-1, chrome::GetIndexOfSingletonTab(&singleton_params));
}
@@ -1433,7 +1433,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
// Navigate to the page.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.url = GURL(data_url);
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
ui_test_utils::NavigateToURL(&params);
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698