Convert WindowOpenDisposition to an enum class.
This is done in preparation for mojoifying this enum; mojo only generates 'enum class' enums.
[email protected]
BUG=627852
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
Review-Url: https://codereview.chromium.org/2248873002
Cr-Commit-Position: refs/heads/master@{#415722}
diff --git a/chrome/browser/android/service_tab_launcher.cc b/chrome/browser/android/service_tab_launcher.cc
index 02ae62c..92a8a1a2 100644
--- a/chrome/browser/android/service_tab_launcher.cc
+++ b/chrome/browser/android/service_tab_launcher.cc
@@ -43,8 +43,10 @@
const content::OpenURLParams& params,
const TabLaunchedCallback& callback) {
WindowOpenDisposition disposition = params.disposition;
- if (disposition != NEW_WINDOW && disposition != NEW_POPUP &&
- disposition != NEW_FOREGROUND_TAB && disposition != NEW_BACKGROUND_TAB) {
+ if (disposition != WindowOpenDisposition::NEW_WINDOW &&
+ disposition != WindowOpenDisposition::NEW_POPUP &&
+ disposition != WindowOpenDisposition::NEW_FOREGROUND_TAB &&
+ disposition != WindowOpenDisposition::NEW_BACKGROUND_TAB) {
// ServiceTabLauncher can currently only launch new tabs.
NOTIMPLEMENTED();
return;
@@ -66,7 +68,7 @@
Java_ServiceTabLauncher_launchTab(env, GetApplicationContext(), request_id,
browser_context->IsOffTheRecord(), url,
- disposition, referrer_url,
+ static_cast<int>(disposition), referrer_url,
params.referrer.policy, headers, post_data);
}
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 463f277a..cf6c1cc 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -214,11 +214,11 @@
WindowOpenDisposition disposition = params->disposition;
const GURL& url = params->url;
- if (disposition == NEW_POPUP ||
- disposition == NEW_FOREGROUND_TAB ||
- disposition == NEW_BACKGROUND_TAB ||
- disposition == NEW_WINDOW ||
- disposition == OFF_THE_RECORD) {
+ if (disposition == WindowOpenDisposition::NEW_POPUP ||
+ disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_WINDOW ||
+ disposition == WindowOpenDisposition::OFF_THE_RECORD) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> jobj = weak_java_tab_.get(env);
ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(env, url.spec()));
@@ -227,9 +227,9 @@
ScopedJavaLocalRef<jobject> jpost_data;
if (params->uses_post && params->post_data)
jpost_data = params->post_data->ToJavaObject(env);
- Java_Tab_openNewTab(env, jobj, jurl, jheaders, jpost_data, disposition,
- params->created_with_opener,
- params->is_renderer_initiated);
+ Java_Tab_openNewTab(
+ env, jobj, jurl, jheaders, jpost_data, static_cast<int>(disposition),
+ params->created_with_opener, params->is_renderer_initiated);
} else {
NOTIMPLEMENTED();
}
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
index 41507a3..fa9eb215 100644
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -300,12 +300,12 @@
WebContents* source,
const content::OpenURLParams& params) {
WindowOpenDisposition disposition = params.disposition;
- if (!source || (disposition != CURRENT_TAB &&
- disposition != NEW_FOREGROUND_TAB &&
- disposition != NEW_BACKGROUND_TAB &&
- disposition != OFF_THE_RECORD &&
- disposition != NEW_POPUP &&
- disposition != NEW_WINDOW)) {
+ if (!source || (disposition != WindowOpenDisposition::CURRENT_TAB &&
+ disposition != WindowOpenDisposition::NEW_FOREGROUND_TAB &&
+ disposition != WindowOpenDisposition::NEW_BACKGROUND_TAB &&
+ disposition != WindowOpenDisposition::OFF_THE_RECORD &&
+ disposition != WindowOpenDisposition::NEW_POPUP &&
+ disposition != WindowOpenDisposition::NEW_WINDOW)) {
// We can't handle this here. Give the parent a chance.
return WebContentsDelegateAndroid::OpenURLFromTab(source, params);
}
@@ -323,10 +323,10 @@
PopupBlockerTabHelper::FromWebContents(source);
DCHECK(popup_blocker_helper);
- if ((params.disposition == NEW_POPUP ||
- params.disposition == NEW_FOREGROUND_TAB ||
- params.disposition == NEW_BACKGROUND_TAB ||
- params.disposition == NEW_WINDOW) &&
+ if ((params.disposition == WindowOpenDisposition::NEW_POPUP ||
+ params.disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ params.disposition == WindowOpenDisposition::NEW_WINDOW) &&
!params.user_gesture &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisablePopupBlocking)) {
@@ -336,7 +336,7 @@
}
}
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
// Only prerender for a current-tab navigation to avoid session storage
// namespace issues.
nav_params.target_contents = source;
@@ -369,9 +369,9 @@
bool user_gesture,
bool* was_blocked) {
// No code for this yet.
- DCHECK_NE(disposition, SAVE_TO_DISK);
+ DCHECK_NE(disposition, WindowOpenDisposition::SAVE_TO_DISK);
// Can't create a new contents for the current tab - invalid case.
- DCHECK_NE(disposition, CURRENT_TAB);
+ DCHECK_NE(disposition, WindowOpenDisposition::CURRENT_TAB);
TabHelpers::AttachTabHelpers(new_contents);
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index d9fc6b4..f6abb9f 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -642,7 +642,7 @@
// Test that opening a new tab updates the handoff URL.
GURL test_url2 = embedded_test_server()->GetURL("/title2.html");
chrome::NavigateParams params(browser(), test_url2, ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
ui_test_utils::NavigateToURL(¶ms);
EXPECT_EQ(g_handoff_url, test_url2);
@@ -657,7 +657,7 @@
// Test that opening a new browser window updates the handoff URL.
GURL test_url3 = embedded_test_server()->GetURL("/title3.html");
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(test_url3), NEW_WINDOW,
+ browser(), GURL(test_url3), WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(g_handoff_url, test_url3);
@@ -673,7 +673,7 @@
// The URLs of incognito windows should not be passed to Handoff.
GURL test_url4 = embedded_test_server()->GetURL("/simple.html");
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(test_url4), OFF_THE_RECORD,
+ browser(), GURL(test_url4), WindowOpenDisposition::OFF_THE_RECORD,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(g_handoff_url, GURL());
@@ -681,7 +681,7 @@
EXPECT_EQ(2u, active_browser_list->size());
Browser* browser3 = active_browser_list->get(1);
ui_test_utils::NavigateToURLWithDisposition(
- browser3, test_url4, NEW_FOREGROUND_TAB,
+ browser3, test_url4, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
EXPECT_EQ(g_handoff_url, GURL());
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index f513a78..b2ac59e 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -231,9 +231,9 @@
return false;
}
- AppLaunchParams params(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST);
+ AppLaunchParams params(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
params.command_line = command_line;
params.current_directory = test_data_dir_;
OpenApplication(params);
@@ -880,9 +880,9 @@
content::WindowedNotificationObserver app_loaded_observer(
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
app_loaded_observer.Wait();
window = GetFirstAppWindow();
ASSERT_TRUE(window);
@@ -1011,9 +1011,9 @@
ASSERT_TRUE(should_install.seen());
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
}
@@ -1034,9 +1034,9 @@
ASSERT_TRUE(extension);
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_FALSE(should_not_install.seen());
@@ -1072,9 +1072,9 @@
ASSERT_TRUE(should_install.seen());
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
}
@@ -1097,9 +1097,9 @@
{
ExtensionTestMessageListener launched_listener("Launched", false);
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
}
@@ -1244,8 +1244,8 @@
registry->AddObserver(this);
OpenApplication(CreateAppLaunchParamsUserContainer(
- incognito_profile, file_manager, NEW_FOREGROUND_TAB,
- extensions::SOURCE_TEST));
+ incognito_profile, file_manager,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST));
while (!base::ContainsKey(opener_app_ids_, file_manager->id())) {
content::RunAllPendingInMessageLoop();
diff --git a/chrome/browser/apps/app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc
index 5f698e46..86b2c8d 100644
--- a/chrome/browser/apps/app_browsertest_util.cc
+++ b/chrome/browser/apps/app_browsertest_util.cc
@@ -121,14 +121,15 @@
}
void PlatformAppBrowserTest::LaunchPlatformApp(const Extension* extension) {
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
}
void PlatformAppBrowserTest::LaunchHostedApp(const Extension* extension) {
OpenApplication(CreateAppLaunchParamsUserContainer(
- browser()->profile(), extension, NEW_FOREGROUND_TAB,
+ browser()->profile(), extension,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
extensions::SOURCE_COMMAND_LINE));
}
diff --git a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
index 61269fe..940270c 100644
--- a/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
+++ b/chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc
@@ -216,7 +216,7 @@
extension_misc::APP_LAUNCH_CMD_LINE_APP, extension->GetType());
if (extension->is_hosted_app()) {
OpenApplication(CreateAppLaunchParamsUserContainer(
- profile, extension, NEW_FOREGROUND_TAB,
+ profile, extension, WindowOpenDisposition::NEW_FOREGROUND_TAB,
extensions::SOURCE_COMMAND_LINE));
return;
}
diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc
index b85606b5e..2dc8f4c 100644
--- a/chrome/browser/apps/app_window_browsertest.cc
+++ b/chrome/browser/apps/app_window_browsertest.cc
@@ -218,9 +218,9 @@
test_data_dir_.AppendASCII("platform_apps").AppendASCII("window_api"));
EXPECT_TRUE(extension);
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ExtensionTestMessageListener geometry_listener("ListenGeometryChange", true);
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index 791e2a5..fb18949 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -1939,9 +1939,8 @@
ExtensionTestMessageListener load_listener("WebViewTest.LOADSTOP", false);
// Navigating to a file URL is forbidden inside a <webview>.
- content::OpenURLParams params(GURL("file://foo"),
- content::Referrer(),
- CURRENT_TAB,
+ content::OpenURLParams params(GURL("file://foo"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
true /* is_renderer_initiated */);
GetGuestWebContents()->GetDelegate()->OpenURLFromTab(
@@ -1964,9 +1963,9 @@
ExtensionTestMessageListener load_listener("WebViewTest.LOADSTOP", false);
GURL test_url("http://www.google.com");
- content::OpenURLParams params(test_url, content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false /* is_renderer_initiated */);
+ content::OpenURLParams params(
+ test_url, content::Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */);
GetGuestWebContents()->GetDelegate()->OpenURLFromTab(GetGuestWebContents(),
params);
@@ -1984,9 +1983,8 @@
"WebViewTest.NEWWINDOW", false);
// Navigating to a file URL is forbidden inside a <webview>.
- content::OpenURLParams params(GURL("file://foo"),
- content::Referrer(),
- NEW_BACKGROUND_TAB,
+ content::OpenURLParams params(GURL("file://foo"), content::Referrer(),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
true /* is_renderer_initiated */);
GetGuestWebContents()->GetDelegate()->OpenURLFromTab(
diff --git a/chrome/browser/apps/install_chrome_app.cc b/chrome/browser/apps/install_chrome_app.cc
index 0f5fc2f..06b33d0 100644
--- a/chrome/browser/apps/install_chrome_app.cc
+++ b/chrome/browser/apps/install_chrome_app.cc
@@ -83,11 +83,9 @@
Browser* browser = BrowserList::GetInstance()->get(0);
DCHECK(browser);
- content::OpenURLParams params(GetAppInstallUrl(app_id),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false);
+ content::OpenURLParams params(GetAppInstallUrl(app_id), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false);
browser->OpenURL(params);
ExtensionRegistry* registry = ExtensionRegistry::Get(browser->profile());
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 23dcaf3d..46de9bd 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -178,7 +178,7 @@
GURL url = embedded_test_server()->GetURL("/autofill/" + filename);
chrome::NavigateParams params(browser(), url,
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
ui_test_utils::NavigateToURL(¶ms);
std::unique_ptr<WindowedPersonalDataManagerObserver> observer;
diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
index 3174bcb..d2a6bdd 100644
--- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc
+++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
@@ -136,16 +136,12 @@
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
nav_entry_committed_callback_ = runner->QuitClosure();
- browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIBookmarksURL),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
- browser()->OpenURL(content::OpenURLParams(GURL(chrome::kChromeUIAboutURL),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(
+ GURL(chrome::kChromeUIBookmarksURL), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(content::OpenURLParams(
+ GURL(chrome::kChromeUIAboutURL), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
runner->Run();
nav_entry_committed_callback_.Reset();
}
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
index d14ac59..b8c9aa2 100644
--- a/chrome/browser/background/background_mode_manager.cc
+++ b/chrome/browser/background/background_mode_manager.cc
@@ -400,7 +400,8 @@
Profile* profile,
const Extension* extension) {
OpenApplication(CreateAppLaunchParamsUserContainer(
- profile, extension, NEW_FOREGROUND_TAB, extensions::SOURCE_BACKGROUND));
+ profile, extension, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ extensions::SOURCE_BACKGROUND));
}
// static
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index 644b870..5b7dae4 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -164,8 +164,9 @@
// Navigate to a url.
GURL url1("http://foo/1");
AddTab(browser(), url1);
- browser()->OpenURL(OpenURLParams(
- url1, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(OpenURLParams(url1, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
chrome::BookmarkCurrentPageAllowingExtensionOverrides(browser());
@@ -184,7 +185,7 @@
NavigateAndCommitActiveTab(url2);
// Go back in a new background tab.
- chrome::GoBack(browser(), NEW_BACKGROUND_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::NEW_BACKGROUND_TAB);
EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
ASSERT_EQ(2, browser()->tab_strip_model()->count());
@@ -210,7 +211,7 @@
// (to test both codepaths).
CommitPendingLoad(&first->GetController());
EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
- chrome::GoForward(browser(), NEW_BACKGROUND_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::NEW_BACKGROUND_TAB);
// The previous tab should be unchanged and still in the foreground.
EXPECT_EQ(url1, first->GetLastCommittedURL());
@@ -232,7 +233,7 @@
browser()->tab_strip_model()->ActivateTabAt(2, true);
// TODO(brettw) bug 11055: see the comment above about why we need this.
CommitPendingLoad(&second->GetController());
- chrome::GoBack(browser(), NEW_FOREGROUND_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::NEW_FOREGROUND_TAB);
ASSERT_EQ(3, browser()->tab_strip_model()->active_index());
ASSERT_EQ(url1,
browser()->tab_strip_model()->GetActiveWebContents()->
@@ -242,7 +243,7 @@
// TODO(brettw) bug 11055: see the comment above about why we need this.
CommitPendingLoad(&
browser()->tab_strip_model()->GetActiveWebContents()->GetController());
- chrome::GoForward(browser(), NEW_FOREGROUND_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::NEW_FOREGROUND_TAB);
ASSERT_EQ(4, browser()->tab_strip_model()->active_index());
ASSERT_EQ(url2,
browser()->tab_strip_model()->GetActiveWebContents()->
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 5809e90aa..40b82a00 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1250,10 +1250,9 @@
MultiNavigationObserver navigation_observer;
CaptivePortalObserver portal_observer(browser->profile());
- ui_test_utils::NavigateToURLWithDisposition(browser,
- GURL(kMockHttpsUrl),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser, GURL(kMockHttpsUrl), WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
portal_observer.WaitForResults(1);
@@ -1371,10 +1370,9 @@
MultiNavigationObserver navigation_observer;
CaptivePortalObserver portal_observer(browser->profile());
- ui_test_utils::NavigateToURLWithDisposition(browser,
- hanging_url,
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser, hanging_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
portal_observer.WaitForResults(expected_portal_checks);
if (expect_open_login_tab) {
@@ -1460,10 +1458,9 @@
MultiNavigationObserver navigation_observer;
CaptivePortalObserver portal_observer(browser->profile());
- ui_test_utils::NavigateToURLWithDisposition(browser,
- error_url,
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser, error_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
if (delay_portal_response_until_interstital) {
EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE,
@@ -1519,10 +1516,9 @@
RespondToProbeRequests(false);
SSLInterstitialTimerObserver interstitial_timer_observer(broken_tab_contents);
- ui_test_utils::NavigateToURLWithDisposition(browser,
- cert_error_url,
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser, cert_error_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
interstitial_timer_observer.WaitForTimerStarted();
// The tab should be in loading state, waiting for the interstitial timer to
@@ -1775,11 +1771,9 @@
// so waiting for PortalObserver to see that request prevents it from
// confusing the MultiNavigationObservers used later.
tab_strip_model->ActivateTabAt(0, true);
- browser->OpenURL(content::OpenURLParams(timeout_url,
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser->OpenURL(content::OpenURLParams(timeout_url, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
portal_observer.WaitForResults(1);
EXPECT_FALSE(CheckPending(browser));
EXPECT_EQ(1, NumLoadingTabs());
@@ -2120,7 +2114,7 @@
// Page appears loading. Reloading it cancels the page load. Since the load is
// stopped, no cert error occurs and SSLErrorHandler isn't instantiated.
MultiNavigationObserver test_navigation_observer;
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
test_navigation_observer.WaitForNavigations(2);
// Make sure that the |ssl_error_handler| is deleted.
@@ -2179,10 +2173,8 @@
// a load stop notification before starting a new navigation.
MultiNavigationObserver test_navigation_observer;
browser()->OpenURL(content::OpenURLParams(
- URLRequestMockHTTPJob::GetMockUrl("title2.html"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ URLRequestMockHTTPJob::GetMockUrl("title2.html"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
// Expect two navigations: First one for stopping the hanging page, second one
// for completing the load of the above navigation.
test_navigation_observer.WaitForNavigations(2);
@@ -2249,7 +2241,7 @@
CaptivePortalObserver portal_observer(browser()->profile());
MultiNavigationObserver test_navigation_observer;
browser()->OpenURL(content::OpenURLParams(cert_error_url, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
// Expect two navigations: First one for stopping the hanging page, second one
// for completing the load of the above navigation.
@@ -2298,7 +2290,7 @@
CaptivePortalObserver portal_observer(browser()->profile());
MultiNavigationObserver test_navigation_observer;
browser()->OpenURL(content::OpenURLParams(cert_error_url, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
// Expect three navigations:
// 1- For stopping the hanging page.
@@ -2413,9 +2405,8 @@
MultiNavigationObserver navigation_observer;
CaptivePortalObserver portal_observer(browser()->profile());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- URLRequestMockHTTPJob::GetMockUrl("title2.html"),
- NEW_FOREGROUND_TAB,
+ browser(), URLRequestMockHTTPJob::GetMockUrl("title2.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
TabStripModel* tab_strip_model = browser()->tab_strip_model();
@@ -2546,7 +2537,7 @@
// Activate the error page tab again and go back.
TabStripModel* tab_strip_model = browser()->tab_strip_model();
tab_strip_model->ActivateTabAt(0, true);
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
navigation_observer.WaitForNavigations(1);
EXPECT_EQ(1, navigation_observer.NumNavigationsForTab(
@@ -2581,7 +2572,7 @@
// Go to the error page.
MultiNavigationObserver navigation_observer;
CaptivePortalObserver portal_observer(browser()->profile());
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
// Wait for the check triggered by the broken tab and for the login tab to
// stop loading.
@@ -2700,7 +2691,7 @@
chrome::NavigateParams params(inactive_browser,
GURL(kMockHttpsQuickTimeoutUrl),
ui::PAGE_TRANSITION_TYPED);
- params.disposition = NEW_BACKGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.window_action = chrome::NavigateParams::NO_ACTION;
ui_test_utils::NavigateToURL(¶ms);
navigation_observer.WaitForNavigations(2);
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index 10050c6..7c63c33 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -89,11 +89,9 @@
GURL("https://www.chromium.org") };
for (const GURL& url : urls) {
- content::OpenURLParams params(url,
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false);
+ content::OpenURLParams params(url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false);
// TODO(peter): We should have more in-depth browser tests for the window
// opening functionality, which also covers Android. This test can currently
// only be ran on platforms where OpenURL is implemented synchronously.
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
index 00be024..7b697a2 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
@@ -464,9 +464,9 @@
}
// Always open the app in a window.
- OpenApplication(AppLaunchParams(profile_, extension,
- extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_KIOSK));
+ OpenApplication(AppLaunchParams(
+ profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_KIOSK));
KioskAppManager::Get()->InitSession(profile_, app_id_);
user_manager::UserManager::Get()->SessionStarted();
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc
index 99750711..20c6bde 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc
@@ -518,7 +518,8 @@
ArcSupportHost::kHostAppId, profile_));
OpenApplication(CreateAppLaunchParamsUserContainer(
- profile_, extension, NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
+ profile_, extension, WindowOpenDisposition::NEW_WINDOW,
+ extensions::SOURCE_CHROME_INTERNAL));
}
void ArcAuthService::OnContextReady() {
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
index 6f15f127..6d15d02 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
@@ -143,7 +143,7 @@
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
chrome::NavigateParams params(
profile, learn_more_url, ui::PAGE_TRANSITION_LINK);
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
chrome::Navigate(¶ms);
} else {
chrome::ShowSingletonTab(browser, learn_more_url);
diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc
index 4d219df..f63fbee 100644
--- a/chrome/browser/chromeos/enrollment_dialog_view.cc
+++ b/chrome/browser/chromeos/enrollment_dialog_view.cc
@@ -135,7 +135,7 @@
return;
chrome::NavigateParams params(profile_, GURL(target_uri_),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/chromeos/eol_notification.cc b/chrome/browser/chromeos/eol_notification.cc
index 692494d..f246ac4e 100644
--- a/chrome/browser/chromeos/eol_notification.cc
+++ b/chrome/browser/chromeos/eol_notification.cc
@@ -80,7 +80,7 @@
void EolNotificationDelegate::OpenMoreInfoPage() {
chrome::NavigateParams params(profile_, GURL(chrome::kEolNotificationURL),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc
index 7af780e..7027a338 100644
--- a/chrome/browser/chromeos/extensions/echo_private_api.cc
+++ b/chrome/browser/chromeos/extensions/echo_private_api.cc
@@ -207,7 +207,7 @@
GetProfile(), GURL(kMoreInfoLink), ui::PAGE_TRANSITION_LINK);
// Open the link in a new window. The echo dialog is modal, so the current
// window is useless until the dialog is closed.
- params.disposition = NEW_WINDOW;
+ params.disposition = WindowOpenDisposition::NEW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc
index 7c947e106..54ba0915 100644
--- a/chrome/browser/chromeos/extensions/input_method_api.cc
+++ b/chrome/browser/chromeos/extensions/input_method_api.cc
@@ -289,8 +289,8 @@
if (!options_page_url.is_empty()) {
Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
content::OpenURLParams url_params(options_page_url, content::Referrer(),
- SINGLETON_TAB, ui::PAGE_TRANSITION_LINK,
- false);
+ WindowOpenDisposition::SINGLETON_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
browser->OpenURL(url_params);
}
}
diff --git a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
index 46ed021..7f8a499 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_manager_util.cc
@@ -32,9 +32,9 @@
if (!extension)
return;
- OpenApplication(
- AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
+ OpenApplication(AppLaunchParams(
+ profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
}
} // namespace wallpaper_manager_util
diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc
index 35a5a31..33e7dad 100644
--- a/chrome/browser/chromeos/first_run/first_run.cc
+++ b/chrome/browser/chromeos/first_run/first_run.cc
@@ -45,9 +45,9 @@
if (!extension)
return;
- OpenApplication(
- AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
+ OpenApplication(AppLaunchParams(
+ profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
profile->GetPrefs()->SetBoolean(prefs::kFirstRunTutorialShown, true);
}
diff --git a/chrome/browser/chromeos/input_method/textinput_browsertest.cc b/chrome/browser/chromeos/input_method/textinput_browsertest.cc
index 6ba6f32..12df4c0 100644
--- a/chrome/browser/chromeos/input_method/textinput_browsertest.cc
+++ b/chrome/browser/chromeos/input_method/textinput_browsertest.cc
@@ -294,10 +294,8 @@
GURL new_url = ui_test_utils::GetTestUrl(
base::FilePath(FILE_PATH_LITERAL("textinput")),
base::FilePath(FILE_PATH_LITERAL("focus_input_on_load.html")));
- ui_test_utils::NavigateToURLWithDisposition(browser(),
- new_url,
- NEW_FOREGROUND_TAB,
- 0);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), new_url, WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
content::WebContents* new_tab =
browser()->tab_strip_model()->GetActiveWebContents();
EXPECT_NE(base_tab, new_tab);
diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
index 57c9553..77a7d43 100644
--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc
@@ -94,9 +94,10 @@
false,
chromeos::network_handler::ErrorCallback());
- OpenApplication(
- AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL, true));
+ OpenApplication(AppLaunchParams(profile, extension,
+ extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW,
+ extensions::SOURCE_CHROME_INTERNAL, true));
KioskAppManager::Get()->InitSession(profile, extension_id);
user_manager::UserManager::Get()->SessionStarted();
diff --git a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_controller.cc b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_controller.cc
index 6bfc632..7525f895 100644
--- a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_controller.cc
+++ b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_notification_controller.cc
@@ -118,7 +118,7 @@
chrome::NavigateParams params(profile_,
GURL(kChromeAuthenticationSettingsURL),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
diff --git a/chrome/browser/chromeos/login/screens/error_screen.cc b/chrome/browser/chromeos/login/screens/error_screen.cc
index 145c912..d73e70c6 100644
--- a/chrome/browser/chromeos/login/screens/error_screen.cc
+++ b/chrome/browser/chromeos/login/screens/error_screen.cc
@@ -278,9 +278,9 @@
const extensions::Extension* extension =
extension_service->GetExtensionById(extension_id, true);
- OpenApplication(
- AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
+ OpenApplication(AppLaunchParams(
+ profile, extension, extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
KioskAppManager::Get()->InitSession(profile, extension_id);
user_manager::UserManager::Get()->SessionStarted();
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index a854914..f7d81e96 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -722,9 +722,8 @@
Browser* browser =
FindOrCreateVisibleBrowser(profile());
ui_test_utils::NavigateToURLWithDisposition(
- browser,
- fake_google_page_url_,
- CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser, fake_google_page_url_, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
// Wait until we get send merge session request.
WaitForMergeSessionToStart();
diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index a84a3747c..939631f 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
@@ -1565,9 +1565,9 @@
// Start the platform app, causing it to open a window.
run_loop_.reset(new base::RunLoop);
- OpenApplication(AppLaunchParams(profile, app,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ profile, app, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
run_loop_->Run();
EXPECT_EQ(1U, app_window_registry->app_windows().size());
diff --git a/chrome/browser/command_updater.cc b/chrome/browser/command_updater.cc
index e93a729..63e5030 100644
--- a/chrome/browser/command_updater.cc
+++ b/chrome/browser/command_updater.cc
@@ -41,7 +41,7 @@
}
bool CommandUpdater::ExecuteCommand(int id) {
- return ExecuteCommandWithDisposition(id, CURRENT_TAB);
+ return ExecuteCommandWithDisposition(id, WindowOpenDisposition::CURRENT_TAB);
}
bool CommandUpdater::ExecuteCommandWithDisposition(
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc
index e7ca591..d9702e6 100644
--- a/chrome/browser/crash_recovery_browsertest.cc
+++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -39,9 +39,9 @@
content::WindowedNotificationObserver observer(
content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
content::NotificationService::AllSources());
- browser->OpenURL(OpenURLParams(
- GURL(content::kChromeUICrashURL), Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser->OpenURL(OpenURLParams(GURL(content::kChromeUICrashURL), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
observer.Wait();
}
@@ -99,7 +99,7 @@
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_after_crash));
@@ -125,7 +125,7 @@
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_after_crash));
@@ -151,7 +151,7 @@
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_before_crash));
SimulateRendererCrash(browser());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
&title_after_crash));
@@ -167,11 +167,11 @@
SimulateRendererCrash(browser());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(GetActiveWebContents());
ASSERT_EQ(url, GetActiveWebContents()->GetVisibleURL());
}
diff --git a/chrome/browser/data_saver/data_saver_browsertest.cc b/chrome/browser/data_saver/data_saver_browsertest.cc
index f5f9aef..3953ed30 100644
--- a/chrome/browser/data_saver/data_saver_browsertest.cc
+++ b/chrome/browser/data_saver/data_saver_browsertest.cc
@@ -100,7 +100,7 @@
// Reload the webpage and expect the main and the subresources will get the
// correct save-data header.
expected_save_data_header_ = "on";
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
@@ -108,7 +108,7 @@
// will get no save-data header.
EnableDataSaver(false);
expected_save_data_header_ = "";
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
}
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
index 53aa07c..3a35c5b 100644
--- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
+++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -125,7 +125,7 @@
ChromeDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
chrome::NavigateParams params(ProfileManager::GetLastUsedProfile(),
url, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
if (!params.target_contents)
return nullptr;
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 8769583..f002b75f 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -1197,7 +1197,7 @@
ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL));
crash_observer.Wait();
content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
navigation_observer.Wait();
}
};
@@ -1448,7 +1448,7 @@
chrome::DuplicateTab(browser());
chrome::SelectPreviousTab(browser());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
RunTestFunction(window, "testWindowInitializedOnNavigateBack");
DevToolsWindowTesting::CloseDevToolsWindowSync(window);
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index 6626adb..aaf0cfb 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -214,9 +214,9 @@
}
void DefaultBindingsDelegate::OpenInNewTab(const std::string& url) {
- content::OpenURLParams params(
- GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ content::OpenURLParams params(GURL(url), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
Browser* browser = FindBrowser(web_contents_);
browser->OpenURL(params);
}
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index ba7670b5..0102c9d 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -1134,9 +1134,9 @@
}
void DevToolsWindow::OpenInNewTab(const std::string& url) {
- content::OpenURLParams params(
- GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ content::OpenURLParams params(GURL(url), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
WebContents* inspected_web_contents = GetInspectedWebContents();
if (!inspected_web_contents || !inspected_web_contents->OpenURL(params)) {
chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index 4080513..a1c9ef8 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -495,10 +495,8 @@
}
content::OpenURLParams params(
net::FilePathToFileURL(download->GetTargetFilePath()),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
if (download->GetMimeType() == "application/x-x509-user-cert")
chrome::ShowSettingsSubPage(browser, "certificates");
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 6cc0c23..8c22b417 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -605,9 +605,7 @@
void DownloadAndWait(Browser* browser,
const GURL& url) {
DownloadAndWaitWithDisposition(
- browser,
- url,
- CURRENT_TAB,
+ browser, url, WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
@@ -733,9 +731,7 @@
// separate tab.
GURL finish_url(net::URLRequestSlowDownloadJob::kFinishDownloadUrl);
ui_test_utils::NavigateToURLWithDisposition(
- browser,
- finish_url,
- NEW_FOREGROUND_TAB,
+ browser, finish_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -1450,9 +1446,8 @@
// Download a file in the on-record browser and check that it was downloaded
// correctly.
- DownloadAndWaitWithDisposition(browser(),
- url,
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(browser(), url,
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
GetDownloads(browser(), &download_items);
ASSERT_EQ(1UL, download_items.size());
@@ -1480,9 +1475,8 @@
// Download a file in the incognito browser and check that it was downloaded
// correctly.
- DownloadAndWaitWithDisposition(incognito,
- url,
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(incognito, url,
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
GetDownloads(incognito, &download_items);
ASSERT_EQ(1UL, download_items.size());
@@ -1501,9 +1495,7 @@
// Open a web page and wait.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- url,
- NEW_BACKGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// We should have two tabs now.
@@ -1517,11 +1509,8 @@
// Download a file in a new background tab and wait. The tab is automatically
// closed when the download begins.
GURL url(URLRequestMockHTTPJob::GetMockUrl(kDownloadTest1Path));
- DownloadAndWaitWithDisposition(
- browser(),
- url,
- NEW_BACKGROUND_TAB,
- 0);
+ DownloadAndWaitWithDisposition(browser(), url,
+ WindowOpenDisposition::NEW_BACKGROUND_TAB, 0);
// When the download finishes, we should still have one tab.
EXPECT_EQ(1, browser()->tab_strip_model()->count());
@@ -1546,9 +1535,8 @@
// Download a file in a new tab and wait (via Javascript).
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
- DownloadAndWaitWithDisposition(browser(),
- GURL("javascript:openNew()"),
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(browser(), GURL("javascript:openNew()"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should have two tabs.
@@ -1573,18 +1561,16 @@
// Open a new tab and wait.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("javascript:openNew()"),
- CURRENT_TAB,
+ browser(), GURL("javascript:openNew()"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
// Download a file and wait.
GURL url(URLRequestMockHTTPJob::GetMockUrl(kDownloadTest1Path));
- DownloadAndWaitWithDisposition(browser(),
- url,
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(browser(), url,
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
// When the download finishes, we should have two tabs.
@@ -1611,9 +1597,8 @@
// Download a file and wait.
// The file to download is "download-test1.lib".
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
- DownloadAndWaitWithDisposition(browser(),
- GURL("javascript:openNew()"),
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(browser(), GURL("javascript:openNew()"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should still have one tab.
@@ -1642,9 +1627,8 @@
// The file to download is "download-test1.lib".
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
DownloadAndWaitWithDisposition(
- browser(),
- GURL("javascript:document.getElementById('form').submit()"),
- CURRENT_TAB,
+ browser(), GURL("javascript:document.getElementById('form').submit()"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// When the download finishes, we should still have one tab.
@@ -2909,9 +2893,8 @@
ASSERT_TRUE(download_items.empty());
// Download a file.
- DownloadAndWaitWithDisposition(browser(),
- url,
- CURRENT_TAB,
+ DownloadAndWaitWithDisposition(browser(), url,
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
GetDownloads(browser(), &download_items);
ASSERT_EQ(1UL, download_items.size());
@@ -2983,7 +2966,8 @@
// Start downloading a file, wait for it to be created.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), file_url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), file_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
progress_waiter->WaitForFinished();
EXPECT_EQ(1u, progress_waiter->NumDownloadsSeenInState(
DownloadItem::IN_PROGRESS));
@@ -3233,10 +3217,9 @@
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT));
std::unique_ptr<content::DownloadTestObserver> in_progress_observer(
new DisableSafeBrowsingOnInProgressDownload(browser()));
- ui_test_utils::NavigateToURLWithDisposition(browser(),
- download_url,
- NEW_BACKGROUND_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), download_url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
in_progress_observer->WaitForFinished();
// SafeBrowsing should have been disabled by our observer.
@@ -3267,10 +3250,9 @@
DangerousDownloadWaiter(
browser(), 1,
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT));
- ui_test_utils::NavigateToURLWithDisposition(browser(),
- download_url,
- NEW_BACKGROUND_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), download_url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
dangerous_observer->WaitForFinished();
std::vector<DownloadItem*> downloads;
@@ -3311,9 +3293,7 @@
DownloadManagerForBrowser(browser()), 1,
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT));
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(download_url),
- NEW_BACKGROUND_TAB,
+ browser(), GURL(download_url), WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
observer->WaitForFinished();
@@ -3520,7 +3500,8 @@
#endif
// Download a file in a new window and wait.
- DownloadAndWaitWithDisposition(browser(), url, NEW_WINDOW,
+ DownloadAndWaitWithDisposition(browser(), url,
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_NONE);
// When the download finishes, the download shelf SHOULD NOT be visible in
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc
index 728bae4..21a618c8 100644
--- a/chrome/browser/download/download_commands.cc
+++ b/chrome/browser/download/download_commands.cc
@@ -342,7 +342,8 @@
case LEARN_MORE_INTERRUPTED:
GetBrowser()->OpenURL(content::OpenURLParams(
GetLearnMoreURLForInterruptedDownload(), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+ false));
break;
case PAUSE:
download_item_->Pause();
diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc
index 645322d..49eeccfd 100644
--- a/chrome/browser/download/download_danger_prompt_browsertest.cc
+++ b/chrome/browser/download/download_danger_prompt_browsertest.cc
@@ -65,9 +65,9 @@
void OpenNewTab() {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL("about:blank"),
- NEW_FOREGROUND_TAB,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
void SetUpExpectations(
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc
index 11e933d..095d346 100644
--- a/chrome/browser/download/notification/download_item_notification.cc
+++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -252,7 +252,7 @@
UserMetricsAction("DownloadNotification.Click_Stopped"));
GetBrowser()->OpenURL(content::OpenURLParams(
GURL(chrome::kChromeUIDownloadsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
false /* is_renderer_initiated */));
CloseNotificationByUser();
break;
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index 322a15e..c0e69ef 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -579,7 +579,8 @@
// Navigate, unblocking with new tab.
GURL url = URLRequestMockHTTPJob::GetMockUrl("save_page/b.htm");
- NavigateToURLWithDisposition(incognito, url, NEW_FOREGROUND_TAB,
+ NavigateToURLWithDisposition(incognito, url,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Save the page before completion.
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
index c4637b8..f4b3aa3 100644
--- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
+++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
@@ -185,7 +185,8 @@
nullptr /* no WebContents */);
navigation_observer.StartWatchingNewWebContents();
ui_test_utils::NavigateToURLWithDisposition(
- browser(), https_server.GetURL("client-cert"), NEW_FOREGROUND_TAB,
+ browser(), https_server.GetURL("client-cert"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
content::WebContents* const https_contents =
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index 008ea54f..8e3b075 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -497,7 +497,8 @@
CreateDownloadObserver(1));
GURL finish_url(net::URLRequestSlowDownloadJob::kFinishDownloadUrl);
ui_test_utils::NavigateToURLWithDisposition(
- current_browser(), finish_url, NEW_FOREGROUND_TAB,
+ current_browser(), finish_url,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::COMPLETE));
@@ -4035,8 +4036,7 @@
ui_test_utils::NavigateToURLWithDisposition(
current_browser(),
GURL(net::URLRequestSlowDownloadJob::kUnknownSizeUrl),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
observer->WaitForFinished();
EXPECT_EQ(1u, observer->NumDownloadsSeenInState(DownloadItem::IN_PROGRESS));
DownloadManager::DownloadVector items;
@@ -4075,7 +4075,7 @@
ui_test_utils::NavigateToURLWithDisposition(
current_browser(),
GURL(net::URLRequestSlowDownloadJob::kErrorDownloadUrl),
- NEW_BACKGROUND_TAB,
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Errors caught before filename determination are delayed until after
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 4bd372c..a8f61c9 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -765,7 +765,7 @@
// Open a new web popup window.
chrome::NavigateParams params(browser(), GURL("http://www.google.com/"),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
ui_test_utils::NavigateToURL(¶ms);
Browser* popup_browser = params.browser;
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 3e922668..35b9de58 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -97,10 +97,10 @@
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
// Open a new window.
- new_browser = chrome::FindBrowserWithWebContents(
- browser()->OpenURL(content::OpenURLParams(
- GURL("about:"), content::Referrer(), NEW_WINDOW,
- ui::PAGE_TRANSITION_TYPED, false)));
+ new_browser = chrome::FindBrowserWithWebContents(browser()->OpenURL(
+ content::OpenURLParams(GURL("about:"), content::Referrer(),
+ WindowOpenDisposition::NEW_WINDOW,
+ ui::PAGE_TRANSITION_TYPED, false)));
// Hide all the buttons to test that it opens even when the browser action
// is in the overflow bucket.
ToolbarActionsModel::Get(profile())->SetVisibleIconCount(0);
@@ -378,7 +378,7 @@
// Create a new browser window to prevent the message loop from terminating.
browser()->OpenURL(content::OpenURLParams(GURL("about:"), content::Referrer(),
- NEW_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW,
ui::PAGE_TRANSITION_TYPED, false));
// Forcibly closing the browser HWND should not cause a crash.
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index 27f2b5f..93cc4a0da 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -179,9 +179,10 @@
// returned.
extensions::LaunchContainer launch_container =
GetLaunchContainer(extensions::ExtensionPrefs::Get(context), extension);
- OpenApplication(AppLaunchParams(
- Profile::FromBrowserContext(context), extension, launch_container,
- NEW_FOREGROUND_TAB, extensions::SOURCE_MANAGEMENT_API));
+ OpenApplication(AppLaunchParams(Profile::FromBrowserContext(context),
+ extension, launch_container,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ extensions::SOURCE_MANAGEMENT_API));
extensions::RecordAppLaunchType(extension_misc::APP_LAUNCH_EXTENSION_API,
extension->GetType());
}
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index e51dd43..285c8be 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -304,9 +304,9 @@
ASSERT_TRUE(extension);
extensions::ResultCatcher catcher;
- AppLaunchParams params(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST);
+ AppLaunchParams params(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
params.command_line = *base::CommandLine::ForCurrentProcess();
OpenApplication(params);
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index 5a780124..cfcb119 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -152,9 +152,9 @@
std::unique_ptr<base::ListValue> args(new base::ListValue());
args->Set(0, new base::StringValue(input));
- if (disposition == NEW_FOREGROUND_TAB)
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
args->Set(1, new base::StringValue(kForegroundTabDisposition));
- else if (disposition == NEW_BACKGROUND_TAB)
+ else if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)
args->Set(1, new base::StringValue(kBackgroundTabDisposition));
else
args->Set(1, new base::StringValue(kCurrentTabDisposition));
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
index f33ce975..c32c60e 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
@@ -177,7 +177,7 @@
ASCIIToUTF16("keyword command"), base::string16::npos, std::string(),
GURL(), OmniboxEventProto::NTP, true, false, true, true, false,
ChromeAutocompleteSchemeClassifier(profile)));
- omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
+ omnibox_view->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB, false);
WaitForAutocompleteDone(autocomplete_controller);
EXPECT_TRUE(autocomplete_controller->done());
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
@@ -192,7 +192,8 @@
ASCIIToUTF16("keyword newtab"), base::string16::npos, std::string(),
GURL(), OmniboxEventProto::NTP, true, false, true, true, false,
ChromeAutocompleteSchemeClassifier(profile)));
- omnibox_view->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
+ omnibox_view->model()->AcceptInput(WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ false);
WaitForAutocompleteDone(autocomplete_controller);
EXPECT_TRUE(autocomplete_controller->done());
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
index 3d73adf..c741ee0 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -262,7 +262,7 @@
chrome::NavigateParams params(
browser, uninstall_url, ui::PAGE_TRANSITION_CLIENT_REDIRECT);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.user_gesture = false;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc
index e308528..3534890 100644
--- a/chrome/browser/extensions/api/sessions/sessions_api.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -472,7 +472,8 @@
BrowserLiveTabContext::FindContextForWebContents(
browser->tab_strip_model()->GetActiveWebContents());
std::vector<sessions::LiveTab*> restored_tabs =
- tab_restore_service->RestoreEntryById(context, session_id.id(), UNKNOWN);
+ tab_restore_service->RestoreEntryById(context, session_id.id(),
+ WindowOpenDisposition::UNKNOWN);
// If the ID is invalid, restored_tabs will be empty.
if (restored_tabs.empty()) {
SetInvalidIdError(session_id.ToString());
@@ -514,8 +515,8 @@
content::WebContents* contents = tab_strip->GetActiveWebContents();
content::WebContents* tab_contents =
- SessionRestore::RestoreForeignSessionTab(contents, *tab,
- NEW_FOREGROUND_TAB);
+ SessionRestore::RestoreForeignSessionTab(
+ contents, *tab, WindowOpenDisposition::NEW_FOREGROUND_TAB);
SetResultRestoredTab(tab_contents);
return true;
}
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 580b1cd8..ffd167bf 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -240,7 +240,7 @@
EXPECT_TRUE(listener.WaitUntilSatisfied());
content::OpenURLParams params(GURL("about:blank"), content::Referrer(),
- NEW_FOREGROUND_TAB,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
@@ -276,7 +276,7 @@
// Open a new tab and make sure capture is denied.
EXPECT_TRUE(before_open_tab.WaitUntilSatisfied());
content::OpenURLParams params(GURL("http://google.com"), content::Referrer(),
- NEW_FOREGROUND_TAB,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
before_open_tab.Reply("");
@@ -356,7 +356,7 @@
// Open a tab on a chrome:// page and make sure we can capture.
content::OpenURLParams params(GURL("chrome://version"), content::Referrer(),
- NEW_FOREGROUND_TAB,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
const Extension* extension = ExtensionRegistry::Get(
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index f4d7aa5..5f2410c 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -638,7 +638,7 @@
for (const GURL& url : urls) {
chrome::NavigateParams navigate_params(new_window, url,
ui::PAGE_TRANSITION_LINK);
- navigate_params.disposition = NEW_FOREGROUND_TAB;
+ navigate_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
navigate_params.source_site_instance =
render_frame_host()->GetSiteInstance();
chrome::Navigate(&navigate_params);
@@ -1597,7 +1597,8 @@
// This does as same as Browser::ReloadInternal.
NavigationEntry* entry = web_contents->GetController().GetVisibleEntry();
GURL reload_url = entry ? entry->GetURL() : GURL(url::kAboutBlankURL);
- OpenURLParams params(reload_url, Referrer(), CURRENT_TAB,
+ OpenURLParams params(reload_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_RELOAD, false);
GetCurrentBrowser()->OpenURL(params);
} else if (bypass_cache) {
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc
index eb4cc8b..75d3585 100644
--- a/chrome/browser/extensions/api/tabs/tabs_test.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_test.cc
@@ -1134,11 +1134,9 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTab) {
- content::OpenURLParams params(GURL(url::kAboutBlankURL),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
int tab_id = ExtensionTabUtil::GetTabId(web_contents);
int window_id = ExtensionTabUtil::GetWindowIdOfTab(web_contents);
@@ -1178,11 +1176,9 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DuplicateTabNoPermission) {
- content::OpenURLParams params(GURL(url::kAboutBlankURL),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
int tab_id = ExtensionTabUtil::GetTabId(web_contents);
int window_id = ExtensionTabUtil::GetWindowIdOfTab(web_contents);
@@ -1322,8 +1318,8 @@
// Create two aditional tabs.
content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_LINK,
- false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents_a = browser()->OpenURL(params);
content::WebContents* web_contents_b = browser()->OpenURL(params);
@@ -1440,9 +1436,10 @@
// Tests chrome.tabs.discard(tabId).
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardWithId) {
- // Create an aditional tab.
+ // Create an additional tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(url::kAboutBlankURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetWebContentsAt(1);
@@ -1480,9 +1477,10 @@
// Tests chrome.tabs.discard(invalidId).
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardWithInvalidId) {
- // Create an aditional tab.
+ // Create an additional tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(url::kAboutBlankURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Set up the function with an extension.
@@ -1511,9 +1509,10 @@
// Tests chrome.tabs.discard().
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardWithoutId) {
- // Create an aditional tab.
+ // Create an additional tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(url::kAboutBlankURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetWebContentsAt(1);
@@ -1545,9 +1544,10 @@
// Tests chrome.tabs.discard() without disabling protection time.
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, DiscardNoTabProtection) {
- // Create an aditional tab.
+ // Create an additional tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(url::kAboutBlankURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Make sure protection time isn't disabled.
@@ -1577,8 +1577,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionTabsTest, AutoDiscardableProperty) {
// Create two aditional tabs.
content::OpenURLParams params(GURL(url::kAboutBlankURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_LINK,
- false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents_a = browser()->OpenURL(params);
content::WebContents* web_contents_b = browser()->OpenURL(params);
@@ -1868,9 +1868,7 @@
content::WebContents* ExtensionTabsZoomTest::OpenUrlAndWaitForLoad(
const GURL& url) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- url,
- NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
return browser()->tab_strip_model()->GetActiveWebContents();
}
@@ -1882,11 +1880,9 @@
}
content::OpenURLParams GetOpenParams(const char* url) {
- return content::OpenURLParams(GURL(url),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ return content::OpenURLParams(GURL(url), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
}
} // namespace
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index 9e72eca..c15439b 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -374,12 +374,12 @@
// We only send the onCreatedNavigationTarget if we end up creating a new
// window.
- if (disposition != SINGLETON_TAB &&
- disposition != NEW_FOREGROUND_TAB &&
- disposition != NEW_BACKGROUND_TAB &&
- disposition != NEW_POPUP &&
- disposition != NEW_WINDOW &&
- disposition != OFF_THE_RECORD)
+ if (disposition != WindowOpenDisposition::SINGLETON_TAB &&
+ disposition != WindowOpenDisposition::NEW_FOREGROUND_TAB &&
+ disposition != WindowOpenDisposition::NEW_BACKGROUND_TAB &&
+ disposition != WindowOpenDisposition::NEW_POPUP &&
+ disposition != WindowOpenDisposition::NEW_WINDOW &&
+ disposition != WindowOpenDisposition::OFF_THE_RECORD)
return;
helpers::DispatchOnCreatedNavigationTarget(web_contents(),
diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
index 563881a2..a0ea8893 100644
--- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -542,7 +542,7 @@
const std::string kHost = "example.com";
GURL url = embedded_test_server()->GetURL(kHost, "/empty.html");
chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
ui_test_utils::NavigateToURL(¶ms);
content::WebContents* web_contents =
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 04fc9ba..e3693b3e 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -87,7 +87,8 @@
// processes, but they have no elevated privileges and thus should not
// have WebUI bindings.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
+ browser(), base_url.Resolve("path1/empty.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
LOG(INFO) << "Nav 1.";
EXPECT_TRUE(process_map->Contains(
@@ -162,7 +163,8 @@
// it. Either way, app tabs should be considered extension processes, but
// they have no elevated privileges and thus should not have WebUI bindings.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
+ browser(), base_url.Resolve("path1/empty.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_TRUE(process_map->Contains(
browser()->tab_strip_model()->GetWebContentsAt(1)->
@@ -171,7 +173,8 @@
LOG(INFO) << "Nav 1.";
ui_test_utils::NavigateToURLWithDisposition(
- browser(), base_url.Resolve("path2/empty.html"), NEW_FOREGROUND_TAB,
+ browser(), base_url.Resolve("path2/empty.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_TRUE(process_map->Contains(
browser()->tab_strip_model()->GetWebContentsAt(2)->
@@ -316,7 +319,8 @@
// it. Either way, bookmark app tabs should be considered normal processes
// with no elevated privileges and no WebUI bindings.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB,
+ browser(), base_url.Resolve("path1/empty.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_FALSE(process_map->Contains(
browser()->tab_strip_model()->GetWebContentsAt(1)->
@@ -499,7 +503,7 @@
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
LOG(INFO) << "Reloading.";
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
reload_observer.Wait();
LOG(INFO) << "Reloading - done.";
EXPECT_TRUE(process_map->Contains(
@@ -515,7 +519,7 @@
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
LOG(INFO) << "Reloading.";
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
reload_observer2.Wait();
LOG(INFO) << "Reloading - done.";
EXPECT_FALSE(process_map->Contains(
@@ -807,7 +811,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
contents,
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc
index c8d4428..126beb51e 100644
--- a/chrome/browser/extensions/content_script_apitest.cc
+++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -421,7 +421,8 @@
// listening for.
ui_test_utils::NavigateToURLWithDisposition(
browser(), extension->GetResourceURL("fire_event.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
EXPECT_TRUE(catcher.GetNextResult());
}
@@ -474,10 +475,8 @@
// Navigate! Both extensions will try to inject.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- embedded_test_server()->GetURL("/empty.html"),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), embedded_test_server()->GetURL("/empty.html"),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
run_loop.Run();
// Right now, the alert dialog is showing and blocking injection of anything
@@ -499,9 +498,8 @@
// We're going to close a tab in this test, so make a new one (to ensure
// we don't close the browser).
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- embedded_test_server()->GetURL("/empty.html"),
- NEW_FOREGROUND_TAB,
+ browser(), embedded_test_server()->GetURL("/empty.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Set up the same as the previous test case.
@@ -529,10 +527,8 @@
// Navitate!
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- embedded_test_server()->GetURL("/empty.html"),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), embedded_test_server()->GetURL("/empty.html"),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
// Now, instead of closing the dialog, just close the tab. Later scripts
// should never get a chance to run (and we shouldn't crash).
@@ -566,10 +562,8 @@
// Navigate!
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- embedded_test_server()->GetURL("/empty.html"),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), embedded_test_server()->GetURL("/empty.html"),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
run_loop.Run();
@@ -612,7 +606,8 @@
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("/empty.html"),
- CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(listener.was_satisfied());
}
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 165daa5..aa508eb 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -373,7 +373,8 @@
download_manager, kNumDownloadsExpected,
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_ACCEPT));
LOG(ERROR) << "PackAndInstallExtension: Navigating to URL";
- ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB,
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), url, WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
EXPECT_TRUE(WaitForCrxInstallerDone());
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 2f14cdda..177ac9bc 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -340,9 +340,9 @@
else
ui_test_utils::NavigateToURL(browser(), url);
} else if (launch_platform_app) {
- AppLaunchParams params(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST);
+ AppLaunchParams params(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
params.command_line = *base::CommandLine::ForCurrentProcess();
OpenApplication(params);
}
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index b1eff5f5..4590b770 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -318,7 +318,8 @@
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
AppLaunchParams params(profile(), app, extensions::LAUNCH_CONTAINER_NONE,
- NEW_WINDOW, extensions::SOURCE_TEST);
+ WindowOpenDisposition::NEW_WINDOW,
+ extensions::SOURCE_TEST);
params.command_line = *base::CommandLine::ForCurrentProcess();
OpenApplication(params);
app_loaded_observer.Wait();
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index 2755e9d..773a28b 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -244,7 +244,8 @@
switch (command_id) {
case NAME: {
content::OpenURLParams params(ManifestURL::GetHomepageURL(extension),
- content::Referrer(), NEW_FOREGROUND_TAB,
+ content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
browser_->OpenURL(params);
break;
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 12145f3..2ea243a7 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -554,7 +554,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
// Extension should now be loaded.
diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
index a50ad814..7b4fff1 100644
--- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc
@@ -194,7 +194,7 @@
GURL url = extension->GetResourceURL("");
int starting_tab_count = browser()->tab_strip_model()->count();
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
int tab_count = browser()->tab_strip_model()->count();
EXPECT_EQ(starting_tab_count + 1, tab_count);
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 616c6f8..9b933a5 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -228,12 +228,10 @@
// perform our cleanup here before opening the new tab.
OnClose();
if (!g_should_ignore_learn_more_for_testing) {
- browser_->OpenURL(
- content::OpenURLParams(delegate_->GetLearnMoreUrl(),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ browser_->OpenURL(content::OpenURLParams(
+ delegate_->GetLearnMoreUrl(), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+ false));
}
// Warning: |this| may be deleted here!
}
diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
index bdb10b1..b9671a8 100644
--- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
+++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
@@ -160,7 +160,8 @@
GetNotificationId(extension->id()));
OpenApplication(AppLaunchParams(profile(), extension, LAUNCH_CONTAINER_NONE,
- NEW_WINDOW, extensions::SOURCE_TEST));
+ WindowOpenDisposition::NEW_WINDOW,
+ extensions::SOURCE_TEST));
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
// Instruct the app to write |num_bytes| of data.
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index cfd503c..07372150 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -242,8 +242,9 @@
add_types |= TabStripModel::ADD_PINNED;
chrome::NavigateParams navigate_params(
browser, url, ui::PAGE_TRANSITION_LINK);
- navigate_params.disposition =
- active ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+ navigate_params.disposition = active
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB;
navigate_params.tabstrip_index = index;
navigate_params.tabstrip_add_types = add_types;
chrome::Navigate(&navigate_params);
@@ -595,7 +596,7 @@
// among other things, whether the location bar gets displayed.
// TODO(mpcomplete): This seems wrong. What if the extension content is hosted
// in a tab?
- if (disposition == NEW_POPUP)
+ if (disposition == WindowOpenDisposition::NEW_POPUP)
params.extension_app_id = extension_id;
params.disposition = disposition;
diff --git a/chrome/browser/extensions/extension_tab_util_browsertest.cc b/chrome/browser/extensions/extension_tab_util_browsertest.cc
index c245550..4362f4e76 100644
--- a/chrome/browser/extensions/extension_tab_util_browsertest.cc
+++ b/chrome/browser/extensions/extension_tab_util_browsertest.cc
@@ -83,9 +83,7 @@
// If the user navigates to the options page e.g. by typing in the url, it
// should not override the currently-open tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- options_url,
- NEW_FOREGROUND_TAB,
+ browser(), options_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(4, browser()->tab_strip_model()->count());
EXPECT_EQ(options_url, GetActiveUrl(browser()));
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc
index d302b51..b561870 100644
--- a/chrome/browser/extensions/extension_uninstall_dialog.cc
+++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -195,7 +195,7 @@
profile_,
extension_urls::GetWebstoreReportAbuseUrl(extension_->id(), kReferrerId),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc
index d36b3d00..615e13c 100644
--- a/chrome/browser/extensions/extension_view_host.cc
+++ b/chrome/browser/extensions/extension_view_host.cc
@@ -148,13 +148,13 @@
const OpenURLParams& params) {
// Whitelist the dispositions we will allow to be opened.
switch (params.disposition) {
- case SINGLETON_TAB:
- case NEW_FOREGROUND_TAB:
- case NEW_BACKGROUND_TAB:
- case NEW_POPUP:
- case NEW_WINDOW:
- case SAVE_TO_DISK:
- case OFF_THE_RECORD: {
+ case WindowOpenDisposition::SINGLETON_TAB:
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::NEW_BACKGROUND_TAB:
+ case WindowOpenDisposition::NEW_POPUP:
+ case WindowOpenDisposition::NEW_WINDOW:
+ case WindowOpenDisposition::SAVE_TO_DISK:
+ case WindowOpenDisposition::OFF_THE_RECORD: {
// Only allow these from hosts that are bound to a browser (e.g. popups).
// Otherwise they are not driven by a user gesture.
Browser* browser = view_->GetBrowser();
diff --git a/chrome/browser/extensions/fetch_apitest.cc b/chrome/browser/extensions/fetch_apitest.cc
index c35ad6e..cc7d937 100644
--- a/chrome/browser/extensions/fetch_apitest.cc
+++ b/chrome/browser/extensions/fetch_apitest.cc
@@ -64,7 +64,7 @@
// its WebContents.
content::WebContents* CreateAndNavigateTab(const GURL& url) {
chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
ui_test_utils::NavigateToURL(¶ms);
return browser()->tab_strip_model()->GetActiveWebContents();
}
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc
index b68b9b6..5834c54 100644
--- a/chrome/browser/extensions/isolated_app_browsertest.cc
+++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -159,9 +159,9 @@
// If bug fixed, we cannot go back anymore.
// If not fixed, we will redirect back to app2 and can go back again.
EXPECT_TRUE(chrome::CanGoBack(browser()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_TRUE(chrome::CanGoBack(browser()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_FALSE(chrome::CanGoBack(browser()));
// We also need to test script-initialized navigation (document.location.href)
@@ -170,7 +170,8 @@
// the previous history entry.
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("non_app/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
WebContents* tab0 = browser()->tab_strip_model()->GetWebContentsAt(1);
@@ -189,7 +190,7 @@
// This kind of navigation should not replace previous navigation entry.
EXPECT_TRUE(chrome::CanGoBack(browser()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_FALSE(chrome::CanGoBack(browser()));
}
@@ -216,10 +217,12 @@
ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("app2/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("non_app/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(3, browser()->tab_strip_model()->count());
@@ -285,7 +288,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
EXPECT_TRUE(HasCookie(tab0, "app1=3"));
EXPECT_FALSE(HasCookie(tab0, "app2"));
@@ -308,10 +311,12 @@
ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("app2/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("non_app/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(3, browser()->tab_strip_model()->count());
@@ -395,7 +400,8 @@
ASSERT_FALSE(GetInstalledApp(tab0));
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("app1/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
WebContents* tab1 = browser()->tab_strip_model()->GetWebContentsAt(1);
ASSERT_TRUE(GetInstalledApp(tab1));
@@ -425,8 +431,8 @@
// Also create a non-app tab to ensure no new cookies were set in that jar.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), root_url,
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ browser(), root_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
WebContents* tab2 = browser()->tab_strip_model()->GetWebContentsAt(2);
EXPECT_FALSE(HasCookie(tab2, "nonAppMedia=1"));
EXPECT_FALSE(HasCookie(tab2, "app1Media=1"));
@@ -462,7 +468,8 @@
ui_test_utils::NavigateToURL(browser(), base_url.Resolve("app1/main.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("app1/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// For the third tab, use window.open to keep it in process with an opener.
OpenWindow(browser()->tab_strip_model()->GetWebContentsAt(0),
base_url.Resolve("app1/main.html"), true, NULL);
diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc
index f8b3777..5d4facc 100644
--- a/chrome/browser/extensions/process_management_browsertest.cc
+++ b/chrome/browser/extensions/process_management_browsertest.cc
@@ -84,31 +84,39 @@
browser(), base_url.Resolve("isolated_apps/app1/main.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("hosted_app/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("test_file.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("isolated_apps/app2/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("api_test/app_process/path1/empty.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("test_file_with_body.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Load another copy of isolated app 1.
ui_test_utils::NavigateToURLWithDisposition(
browser(), base_url.Resolve("isolated_apps/app1/main.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Load another extension.
const extensions::Extension* extension2 = LoadExtension(
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc
index 2a49f87..cadb4ec 100644
--- a/chrome/browser/extensions/process_manager_browsertest.cc
+++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -281,9 +281,7 @@
// Load a page from the test host in a new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- url,
- NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Sanity check that there's no bleeding between the extension and the tab.
@@ -328,7 +326,7 @@
EXPECT_EQ(0u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
ui_test_utils::NavigateToURLWithDisposition(
- browser(), extension_url, NEW_FOREGROUND_TAB,
+ browser(), extension_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size());
}
@@ -475,7 +473,7 @@
// Now load an extension page and a non-extension page...
ui_test_utils::NavigateToURLWithDisposition(
- browser(), kExt1EmptyUrl, NEW_BACKGROUND_TAB,
+ browser(), kExt1EmptyUrl, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
NavigateToURL(embedded_test_server()->GetURL("/two_iframes.html"));
EXPECT_EQ(1u, pm->GetAllFrames().size());
diff --git a/chrome/browser/extensions/renderer_initialization_browsertest.cc b/chrome/browser/extensions/renderer_initialization_browsertest.cc
index 63fbe88..139e939 100644
--- a/chrome/browser/extensions/renderer_initialization_browsertest.cc
+++ b/chrome/browser/extensions/renderer_initialization_browsertest.cc
@@ -23,9 +23,9 @@
LoadExtension(test_data_dir_.AppendASCII("simple_with_file"));
ASSERT_TRUE(extension);
GURL url = extension->GetResourceURL("file.html");
- browser()->OpenURL(content::OpenURLParams(url, content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(content::OpenURLParams(
+ url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
// Without waiting for the tab to finish, unload the extension.
extension_service()->UnloadExtension(extension->id(),
UnloadedExtensionInfo::REASON_TERMINATE);
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 2c9e0eef1..9a83e812 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -51,7 +51,7 @@
content::WebContents* AddTab(Browser* browser, const GURL& url) {
int starting_tab_count = browser->tab_strip_model()->count();
ui_test_utils::NavigateToURLWithDisposition(
- browser, url, NEW_FOREGROUND_TAB,
+ browser, url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
int tab_count = browser->tab_strip_model()->count();
EXPECT_EQ(starting_tab_count + 1, tab_count);
@@ -129,7 +129,7 @@
// returns it.
content::WebContents* Navigate(const GURL& url) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
index 86a7848..85861ec 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -160,7 +160,8 @@
GURL(redirect_url),
content::Referrer(web_contents()->GetURL(),
blink::WebReferrerPolicyDefault)),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
*error = kInlineInstallSupportedError;
return false;
}
diff --git a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
index a2a25b7..91ad7cf 100644
--- a/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_browsertest.cc
@@ -357,7 +357,8 @@
int old_tab_index = browser()->tab_strip_model()->active_index();
ui_test_utils::NavigateToURLWithDisposition(
browser(), GenerateTestServerUrl(kAppDomain, "both_listeners.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
DCHECK_NE(old_tab_index, browser()->tab_strip_model()->active_index());
browser()->tab_strip_model()->CloseWebContentsAt(old_tab_index,
TabStripModel::CLOSE_NONE);
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index f7d9d92..6608957f 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -191,12 +191,12 @@
->GetURL(popup_app_contents_path + "open_popup.html")
.ReplaceComponents(replace_host);
- browser()->OpenURL(OpenURLParams(
- open_tab, Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
- browser()->OpenURL(OpenURLParams(
- open_popup, Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(OpenURLParams(open_tab, Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(OpenURLParams(open_popup, Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_TRUE(WaitForTabsAndPopups(browser(), 3, 1));
}
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc
index fda079b3..b5dfb65 100644
--- a/chrome/browser/fast_shutdown_browsertest.cc
+++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -53,7 +53,8 @@
chrome::NOTIFICATION_BROWSER_WINDOW_READY,
content::NotificationService::AllSources());
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
window_observer.Wait();
// Close the new window, removing the one and only beforeunload handler.
diff --git a/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
index a1f2675..44bb338 100644
--- a/chrome/browser/favicon/content_favicon_driver_browsertest.cc
+++ b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
@@ -217,7 +217,8 @@
{
PendingTaskWaiter waiter(web_contents(), this);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
waiter.Wait();
}
ASSERT_TRUE(delegate->was_requested());
@@ -231,7 +232,8 @@
{
PendingTaskWaiter waiter(web_contents(), this);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
waiter.Wait();
}
EXPECT_FALSE(delegate->bypassed_cache());
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index c5cc496f..b74e364 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -384,10 +384,10 @@
Browser* browser2 = CreateBrowser(browser()->profile());
ui_test_utils::NavigateToURL(browser2, url2);
ui_test_utils::NavigateToURLWithDisposition(
- browser2, url3, NEW_FOREGROUND_TAB,
+ browser2, url3, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser2, url4, NEW_FOREGROUND_TAB,
+ browser2, url4, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
std::vector<GURL> urls(GetHistoryContents());
@@ -448,7 +448,7 @@
ui_test_utils::NavigateToURL(browser(), url1);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2, NEW_BACKGROUND_TAB,
+ browser(), url2, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
std::vector<GURL> urls(GetHistoryContents());
@@ -478,7 +478,7 @@
content::WebContents* tab =
browser()->tab_strip_model()->GetActiveWebContents();
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(tab);
std::vector<GURL> urls(GetHistoryContents());
@@ -486,7 +486,7 @@
ASSERT_EQ(url1, urls[0]);
ASSERT_EQ(url2, urls[1]);
- chrome::GoForward(browser(), CURRENT_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(tab);
urls = GetHistoryContents();
ASSERT_EQ(2u, urls.size());
@@ -534,9 +534,8 @@
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
chrome::ExecuteCommand(browser(), IDC_SHOW_HISTORY);
diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc
index d1ae3db5..b1e8d2d0 100644
--- a/chrome/browser/history/redirect_browsertest.cc
+++ b/chrome/browser/history/redirect_browsertest.cc
@@ -282,13 +282,15 @@
content::TestNavigationObserver observer(web_contents, 2);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), first_url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), first_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
// We don't sleep here - the first navigation won't have been committed yet
// because we told the server to wait a minute. This means the browser has
// started it's provisional load for the client redirect destination page but
// hasn't completed. Our time is now!
ui_test_utils::NavigateToURLWithDisposition(
- browser(), final_url, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+ browser(), final_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
observer.Wait();
// Check to make sure the navigation did in fact take place and we are
diff --git a/chrome/browser/infobars/infobar_service.cc b/chrome/browser/infobars/infobar_service.cc
index 71b9251..5d0ef271 100644
--- a/chrome/browser/infobars/infobar_service.cc
+++ b/chrome/browser/infobars/infobar_service.cc
@@ -119,8 +119,10 @@
// A normal user click on an infobar URL will result in a CURRENT_TAB
// disposition; turn that into a NEW_FOREGROUND_TAB so that we don't end up
// smashing the page the user is looking at.
- web_contents()->OpenURL(content::OpenURLParams(
- url, content::Referrer(),
- (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
- ui::PAGE_TRANSITION_LINK, false));
+ web_contents()->OpenURL(
+ content::OpenURLParams(url, content::Referrer(),
+ (disposition == WindowOpenDisposition::CURRENT_TAB)
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : disposition,
+ ui::PAGE_TRANSITION_LINK, false));
}
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index 07a78e88..090f91b 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -67,7 +67,8 @@
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("/simple.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WindowedNotificationObserver infobar_added_2(
chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
content::NotificationService::AllSources());
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 1c7e74b..98d33838 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -164,7 +164,8 @@
}
void ChromeControllerClient::OpenUrlInCurrentTab(const GURL& url) {
- content::OpenURLParams params(url, Referrer(), CURRENT_TAB,
+ content::OpenURLParams params(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_LINK, false);
web_contents_->OpenURL(params);
}
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 143c805..e536bca4 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -245,9 +245,8 @@
content::DownloadTestObserverInProgress observer(
content::BrowserContext::GetDownloadManager(browser->profile()), 1);
ui_test_utils::NavigateToURLWithDisposition(
- browser,
- GURL(net::URLRequestSlowDownloadJob::kKnownSizeUrl),
- NEW_BACKGROUND_TAB,
+ browser, GURL(net::URLRequestSlowDownloadJob::kKnownSizeUrl),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
observer.WaitForFinished();
EXPECT_EQ(
@@ -343,11 +342,9 @@
->CloseWebContentsAt(1, TabStripModel::CLOSE_USER_GESTURE);
content::TestNavigationObserver navigation_observer(
browser()->tab_strip_model()->GetActiveWebContents(), 1);
- ASSERT_NO_FATAL_FAILURE(
- NavigateToURLWithDisposition(browser(),
- GURL(chrome::kChromeUIVersionURL),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE));
+ ASSERT_NO_FATAL_FAILURE(NavigateToURLWithDisposition(
+ browser(), GURL(chrome::kChromeUIVersionURL),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE));
ASSERT_NO_FATAL_FAILURE(AcceptClose());
navigation_observer.Wait();
@@ -890,9 +887,7 @@
1,
content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(download_url),
- NEW_BACKGROUND_TAB,
+ browser(), GURL(download_url), WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
observer.WaitForFinished();
diff --git a/chrome/browser/media/defer_background_media_browsertest.cc b/chrome/browser/media/defer_background_media_browsertest.cc
index d30178c..e6b4dd1 100644
--- a/chrome/browser/media/defer_background_media_browsertest.cc
+++ b/chrome/browser/media/defer_background_media_browsertest.cc
@@ -29,7 +29,8 @@
ui_test_utils::NavigateToURLWithDisposition(
browser(), content::GetFileUrlWithQuery(
media::GetTestDataFilePath("bear-640x360.webm"), ""),
- NEW_BACKGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(2, browser()->tab_strip_model()->count());
content::WebContents* background_contents =
diff --git a/chrome/browser/memory/tab_manager_browsertest.cc b/chrome/browser/memory/tab_manager_browsertest.cc
index b181335..d24585d 100644
--- a/chrome/browser/memory/tab_manager_browsertest.cc
+++ b/chrome/browser/memory/tab_manager_browsertest.cc
@@ -59,7 +59,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open1);
load1.Wait();
@@ -67,7 +68,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
load2.Wait();
@@ -75,7 +77,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open3(GURL(chrome::kChromeUITermsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open3);
load3.Wait();
@@ -88,7 +91,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open4(GURL(chrome::kChromeUIVersionURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open4);
load4.Wait();
@@ -96,7 +100,8 @@
WindowedNotificationObserver load5(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- OpenURLParams open5(GURL("chrome://dns"), content::Referrer(), CURRENT_TAB,
+ OpenURLParams open5(GURL("chrome://dns"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open5);
load5.Wait();
@@ -168,14 +173,14 @@
WindowedNotificationObserver back1(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
back1.Wait();
EXPECT_TRUE(chrome::CanGoBack(browser()));
EXPECT_TRUE(chrome::CanGoForward(browser()));
WindowedNotificationObserver back2(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
back2.Wait();
EXPECT_FALSE(chrome::CanGoBack(browser()));
EXPECT_TRUE(chrome::CanGoForward(browser()));
@@ -198,7 +203,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open1);
load1.Wait();
@@ -206,7 +212,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
load2.Wait();
EXPECT_FALSE(tab_manager->recent_tab_discard());
@@ -249,7 +256,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open1);
load1.Wait();
@@ -257,7 +265,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
ASSERT_EQ(2, browser()->tab_strip_model()->count());
@@ -286,7 +295,7 @@
GURL url2(chrome::kChromeUIAboutURL);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2, NEW_FOREGROUND_TAB,
+ browser(), url2, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// No discarding should be possible as the only background tab is displaying a
@@ -315,7 +324,8 @@
// Open 2 tabs, the second one being in the background.
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUIAboutURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(chrome::kChromeUIAboutURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, tsm->count());
@@ -363,7 +373,8 @@
// Open 2 tabs, the second one being in the background.
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUIAboutURL), NEW_BACKGROUND_TAB,
+ browser(), GURL(chrome::kChromeUIAboutURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
auto* tab = browser()->tab_strip_model()->GetWebContentsAt(1);
@@ -404,7 +415,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open1);
load1.Wait();
@@ -412,7 +424,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser()->OpenURL(open2);
load2.Wait();
diff --git a/chrome/browser/memory/tab_manager_observer_browsertest.cc b/chrome/browser/memory/tab_manager_observer_browsertest.cc
index 403b6da..d8a1749d 100644
--- a/chrome/browser/memory/tab_manager_observer_browsertest.cc
+++ b/chrome/browser/memory/tab_manager_observer_browsertest.cc
@@ -88,11 +88,13 @@
// Open two tabs.
OpenURLParams open1(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
int index_1 = GetIndex(browser()->OpenURL(open1));
OpenURLParams open2(GURL(chrome::kChromeUICreditsURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
int index_2 = GetIndex(browser()->OpenURL(open2));
// Subscribe observer to TabManager's observer list.
@@ -150,7 +152,8 @@
// Open two tabs.
OpenURLParams open(GURL(chrome::kChromeUIAboutURL), content::Referrer(),
- NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
WebContents* contents = browser()->OpenURL(open);
// Subscribe observer to TabManager's observer list.
diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc
index 2ba8c021..2167d5a 100644
--- a/chrome/browser/metrics/metrics_service_browsertest.cc
+++ b/chrome/browser/metrics/metrics_service_browsertest.cc
@@ -46,17 +46,13 @@
base::FilePath page1_path = test_directory.AppendASCII("title2.html");
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- net::FilePathToFileURL(page1_path),
- NEW_FOREGROUND_TAB,
- kBrowserTestFlags);
+ browser(), net::FilePathToFileURL(page1_path),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, kBrowserTestFlags);
base::FilePath page2_path = test_directory.AppendASCII("iframe.html");
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- net::FilePathToFileURL(page2_path),
- NEW_FOREGROUND_TAB,
- kBrowserTestFlags);
+ browser(), net::FilePathToFileURL(page2_path),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, kBrowserTestFlags);
}
};
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc
index e489c93..2c9eff56 100644
--- a/chrome/browser/net/errorpage_browsertest.cc
+++ b/chrome/browser/net/errorpage_browsertest.cc
@@ -485,9 +485,9 @@
browser()->tab_strip_model()->GetActiveWebContents(),
num_navigations);
if (direction == HISTORY_NAVIGATE_BACK) {
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
} else if (direction == HISTORY_NAVIGATE_FORWARD) {
- chrome::GoForward(browser(), CURRENT_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB);
} else {
FAIL();
}
diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc
index 9c4fbaf..dee0e47 100644
--- a/chrome/browser/notifications/extension_welcome_notification.cc
+++ b/chrome/browser/notifications/extension_welcome_notification.cc
@@ -88,7 +88,7 @@
profile_,
GURL(chrome::kNotificationWelcomeLearnMoreURL),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/notifications/notification_interactive_uitest.cc b/chrome/browser/notifications/notification_interactive_uitest.cc
index 1d6466b1..f1b87e8 100644
--- a/chrome/browser/notifications/notification_interactive_uitest.cc
+++ b/chrome/browser/notifications/notification_interactive_uitest.cc
@@ -696,9 +696,7 @@
// Test crashing renderer does not close or crash notification.
AllowAllOrigins();
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("about:blank"),
- NEW_BACKGROUND_TAB,
+ browser(), GURL("about:blank"), WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
browser()->tab_strip_model()->ActivateTabAt(0, true);
ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
diff --git a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
index d920c17..87e1782c 100644
--- a/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
+++ b/chrome/browser/page_load_metrics/observers/https_engagement_metrics/https_engagement_page_load_metrics_observer_browsertest.cc
@@ -80,7 +80,8 @@
base::TimeTicks start = base::TimeTicks::Now();
ui_test_utils::NavigateToURL(browser(), url);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUIVersionURL), NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUIVersionURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
base::TimeDelta upper_bound_delta = base::TimeTicks::Now() - start;
@@ -103,7 +104,7 @@
void NavigateInBackgroundAndClose(GURL url) {
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_BACKGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Make sure the correct tab is in the foreground.
@@ -124,7 +125,7 @@
base::TimeDelta NavigateInBackgroundAndCloseInForegroundWithTiming(GURL url) {
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIVersionURL));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_BACKGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Make sure the correct tab is in the foreground.
diff --git a/chrome/browser/password_manager/account_chooser_dialog_android.cc b/chrome/browser/password_manager/account_chooser_dialog_android.cc
index 54a1638..4c7feea 100644
--- a/chrome/browser/password_manager/account_chooser_dialog_android.cc
+++ b/chrome/browser/password_manager/account_chooser_dialog_android.cc
@@ -199,8 +199,8 @@
const JavaParamRef<jobject>& obj) {
web_contents_->OpenURL(content::OpenURLParams(
GURL(password_manager::kPasswordManagerHelpCenterSmartLock),
- content::Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
- false /* is_renderer_initiated */));
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false /* is_renderer_initiated */));
}
void AccountChooserDialogAndroid::WebContentsDestroyed() {
diff --git a/chrome/browser/password_manager/auto_signin_first_run_dialog_android.cc b/chrome/browser/password_manager/auto_signin_first_run_dialog_android.cc
index 157ebc3..caff964 100644
--- a/chrome/browser/password_manager/auto_signin_first_run_dialog_android.cc
+++ b/chrome/browser/password_manager/auto_signin_first_run_dialog_android.cc
@@ -100,8 +100,8 @@
void AutoSigninFirstRunDialogAndroid::OnLinkClicked(JNIEnv* env, jobject obj) {
web_contents_->OpenURL(content::OpenURLParams(
GURL(password_manager::kPasswordManagerHelpCenterSmartLock),
- content::Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
- false /* is_renderer_initiated */));
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false /* is_renderer_initiated */));
}
void AutoSigninFirstRunDialogAndroid::WebContentsDestroyed() {
diff --git a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
index fdaeecc..e8c061a 100644
--- a/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
+++ b/chrome/browser/password_manager/generated_password_saved_infobar_delegate_android.cc
@@ -25,11 +25,11 @@
void GeneratedPasswordSavedInfoBarDelegateAndroid::OnInlineLinkClicked() {
if (smart_lock_branding_enabled_) {
- InfoBarService::WebContentsFromInfoBar(infobar())
- ->OpenURL(content::OpenURLParams(
+ InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
+ content::OpenURLParams(
GURL(password_manager::kPasswordManagerAccountDashboardURL),
- content::Referrer(), NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
- false));
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
} else {
chrome::android::ChromeApplication::ShowPasswordSettings();
}
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index c5d05d39..6d23c5c 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -1290,9 +1290,8 @@
// WebContents, but don't wait for navigation, which only finishes after
// authentication.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- embedded_test_server()->GetURL("/basic_auth"),
- NEW_FOREGROUND_TAB,
+ browser(), embedded_test_server()->GetURL("/basic_auth"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
content::NavigationController* nav_controller =
@@ -2586,8 +2585,8 @@
&WebContents()->GetController();
WindowedAuthNeededObserver auth_needed_observer(nav_controller);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), embedded_test_server()->GetURL("/basic_auth"), CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), embedded_test_server()->GetURL("/basic_auth"),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
auth_needed_observer.Wait();
// The auth dialog caused a query to PasswordStore, make sure it was
@@ -2746,13 +2745,15 @@
// browser.
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, InternalsPage) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL("chrome://password-manager-internals"), CURRENT_TAB,
+ browser(), GURL("chrome://password-manager-internals"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* internals_web_contents = WebContents();
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("/password/password_form.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
std::string find_renderer_logs =
"var text = document.getElementById('log-entries').innerText;"
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index 6d62b2e..2af6878ea 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -108,7 +108,7 @@
// "Browser::EmailPageLocation" (to name only one).
// As such we should keep this code here.
chrome::NavigateParams params(profile, url, ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
if (url.SchemeIs("mailto")) {
std::string string_url = kGmailComposeUrl;
diff --git a/chrome/browser/plugins/plugin_installer.cc b/chrome/browser/plugins/plugin_installer.cc
index 710ae5d..68edf89 100644
--- a/chrome/browser/plugins/plugin_installer.cc
+++ b/chrome/browser/plugins/plugin_installer.cc
@@ -131,10 +131,10 @@
content::WebContents* web_contents) {
DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
web_contents->OpenURL(content::OpenURLParams(
- plugin_url,
- content::Referrer(web_contents->GetURL(),
- blink::WebReferrerPolicyDefault),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ plugin_url, content::Referrer(web_contents->GetURL(),
+ blink::WebReferrerPolicyDefault),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_TYPED,
+ false));
FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished());
}
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index f7f41611..3abca97c 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -441,13 +441,14 @@
#endif // defined(ENABLE_PLUGIN_INSTALLATION)
void PluginObserver::OnOpenAboutPlugins() {
- web_contents()->OpenURL(OpenURLParams(
- GURL(chrome::kChromeUIPluginsURL),
- content::Referrer::SanitizeForRequest(
- GURL(chrome::kChromeUIPluginsURL),
- content::Referrer(web_contents()->GetURL(),
- blink::WebReferrerPolicyDefault)),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
+ web_contents()->OpenURL(
+ OpenURLParams(GURL(chrome::kChromeUIPluginsURL),
+ content::Referrer::SanitizeForRequest(
+ GURL(chrome::kChromeUIPluginsURL),
+ content::Referrer(web_contents()->GetURL(),
+ blink::WebReferrerPolicyDefault)),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
}
void PluginObserver::OnCouldNotLoadPlugin(const base::FilePath& plugin_path) {
diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
index 50855c62..5cf4e7e0 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -313,7 +313,8 @@
embedded_test_server()->RegisterRequestHandler(
base::Bind(&RespondWithHTML, html));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), embedded_test_server()->base_url(), NEW_BACKGROUND_TAB,
+ browser(), embedded_test_server()->base_url(),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
int index = browser()->tab_strip_model()->GetIndexOfLastWebContentsOpenedBy(
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 94e0a495..0ae062c 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -2545,9 +2545,9 @@
// Launch an app that tries to open a fullscreen window.
TestAddAppWindowObserver add_window_observer(
extensions::AppWindowRegistry::Get(browser()->profile()));
- OpenApplication(AppLaunchParams(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
extensions::AppWindow* window = add_window_observer.WaitForAppWindow();
ASSERT_TRUE(window);
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 4208e6c..0370414 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1182,7 +1182,7 @@
}
void NavigateToDestURL() const {
- NavigateToDestURLWithDisposition(CURRENT_TAB, true);
+ NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, true);
}
// Opens the url in a new tab, with no opener.
@@ -1196,7 +1196,8 @@
}
void NavigateToURL(const std::string& dest_html_file) const {
- NavigateToURLWithDisposition(dest_html_file, CURRENT_TAB, true);
+ NavigateToURLWithDisposition(dest_html_file,
+ WindowOpenDisposition::CURRENT_TAB, true);
}
void NavigateToURLWithDisposition(const std::string& dest_html_file,
@@ -1279,7 +1280,7 @@
// Navigates back through the history to the prerendered page.
void GoBackToPrerender() {
TestNavigationObserver back_nav_observer(GetActiveWebContents());
- chrome::GoBack(current_browser(), CURRENT_TAB);
+ chrome::GoBack(current_browser(), WindowOpenDisposition::CURRENT_TAB);
back_nav_observer.Wait();
bool original_prerender_page = false;
ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -1297,7 +1298,7 @@
ASSERT_TRUE(tab);
EXPECT_FALSE(tab->IsLoading());
TestNavigationObserver back_nav_observer(tab);
- chrome::GoBack(current_browser(), CURRENT_TAB);
+ chrome::GoBack(current_browser(), WindowOpenDisposition::CURRENT_TAB);
back_nav_observer.Wait();
bool js_result;
ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
@@ -1627,7 +1628,7 @@
// occur.
// TODO(davidben): The only handles CURRENT_TAB navigations, which is the
// only case tested or prerendered right now.
- CHECK_EQ(CURRENT_TAB, params.disposition);
+ CHECK_EQ(WindowOpenDisposition::CURRENT_TAB, params.disposition);
NavigationOrSwapObserver swap_observer(current_browser()->tab_strip_model(),
GetActiveWebContents());
WebContents* target_web_contents = current_browser()->OpenURL(params);
@@ -1755,7 +1756,7 @@
NavigationOrSwapObserver swap_observer(current_browser()->tab_strip_model(),
GetActiveWebContents());
ui_test_utils::NavigateToURLWithDisposition(
- current_browser(), prerender_page_url, CURRENT_TAB,
+ current_browser(), prerender_page_url, WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
swap_observer.Wait();
@@ -1921,7 +1922,7 @@
prerender_start_loop.Run();
// Navigate to the URL, but assume the contents won't be swapped in.
- NavigateToDestURLWithDisposition(CURRENT_TAB, false);
+ NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that client redirects don't add alias URLs until after they commit.
@@ -1942,7 +1943,8 @@
prerender_start_loop.Run();
// Navigating to the second URL should not swap.
- NavigateToURLWithDisposition(kNoCommitUrl, CURRENT_TAB, false);
+ NavigateToURLWithDisposition(kNoCommitUrl, WindowOpenDisposition::CURRENT_TAB,
+ false);
}
// Checks that the prerendering of a page is canceled correctly when a
@@ -2135,9 +2137,9 @@
NavigationOrSwapObserver swap_observer(
current_browser()->tab_strip_model(),
GetActiveWebContents(), 2);
- current_browser()->OpenURL(OpenURLParams(
- navigate_url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ current_browser()->OpenURL(OpenURLParams(navigate_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
swap_observer.Wait();
EXPECT_TRUE(DidDisplayPass(GetActiveWebContents()));
@@ -2648,7 +2650,7 @@
PrerenderTestURL("/prerender/no_prerender_page.html",
FINAL_STATUS_APP_TERMINATING, 1);
NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment",
- CURRENT_TAB, false);
+ WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that we do not use a prerendered page when we prerender a fragment
@@ -2657,8 +2659,8 @@
PrerenderFragmentNavigatePage) {
PrerenderTestURL("/prerender/no_prerender_page.html#fragment",
FINAL_STATUS_APP_TERMINATING, 1);
- NavigateToURLWithDisposition("/prerender/no_prerender_page.html", CURRENT_TAB,
- false);
+ NavigateToURLWithDisposition("/prerender/no_prerender_page.html",
+ WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that we do not use a prerendered page when we prerender a fragment
@@ -2668,7 +2670,7 @@
PrerenderTestURL("/prerender/no_prerender_page.html#other_fragment",
FINAL_STATUS_APP_TERMINATING, 1);
NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment",
- CURRENT_TAB, false);
+ WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that we do not use a prerendered page when the page uses a client
@@ -2678,8 +2680,8 @@
PrerenderTestURL(
CreateClientRedirect("/prerender/no_prerender_page.html#fragment"),
FINAL_STATUS_APP_TERMINATING, 2);
- NavigateToURLWithDisposition("/prerender/no_prerender_page.html", CURRENT_TAB,
- false);
+ NavigateToURLWithDisposition("/prerender/no_prerender_page.html",
+ WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that we do not use a prerendered page when the page uses a client
@@ -2689,7 +2691,7 @@
PrerenderTestURL(CreateClientRedirect("/prerender/no_prerender_page.html"),
FINAL_STATUS_APP_TERMINATING, 2);
NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment",
- CURRENT_TAB, false);
+ WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that we correctly use a prerendered page when the page uses JS to set
@@ -2833,7 +2835,7 @@
// Switch back to the current tab and attempt to swap it in.
current_browser()->tab_strip_model()->ActivateTabAt(0, true);
- NavigateToDestURLWithDisposition(CURRENT_TAB, false);
+ NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
}
class TestClientCertStore : public net::ClientCertStore {
@@ -3231,7 +3233,7 @@
agent->AttachClient(&client);
const char* url = "/prerender/prerender_page.html";
PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1);
- NavigateToURLWithDisposition(url, CURRENT_TAB, false);
+ NavigateToURLWithDisposition(url, WindowOpenDisposition::CURRENT_TAB, false);
agent->DetachClient(&client);
}
@@ -3526,7 +3528,7 @@
FINAL_STATUS_PAGE_BEING_CAPTURED, 1);
WebContents* web_contents = GetActiveWebContents();
web_contents->IncrementCapturerCount(gfx::Size());
- NavigateToDestURLWithDisposition(CURRENT_TAB, false);
+ NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
web_contents->DecrementCapturerCount();
}
@@ -3609,7 +3611,7 @@
NavigationOrSwapObserver swap_observer(current_browser()->tab_strip_model(),
GetActiveWebContents());
ui_test_utils::NavigateToURLWithDisposition(
- current_browser(), dest_url(), CURRENT_TAB,
+ current_browser(), dest_url(), WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
swap_observer.Wait();
@@ -3646,7 +3648,7 @@
NavigationOrSwapObserver swap_observer(current_browser()->tab_strip_model(),
GetActiveWebContents());
ui_test_utils::NavigateToURLWithDisposition(
- current_browser(), dest_url(), CURRENT_TAB,
+ current_browser(), dest_url(), WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_NONE);
swap_observer.Wait();
@@ -3686,7 +3688,8 @@
PrerenderTestURL("/prerender/prerender_page.html",
FINAL_STATUS_APP_TERMINATING, 1);
- content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB,
+ content::OpenURLParams params(dest_url(), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false);
params.extra_headers = "X-Custom-Header: 42\r\n";
NavigateToURLWithParams(params, false);
@@ -3700,7 +3703,8 @@
FINAL_STATUS_APP_TERMINATING, 1);
std::string post_data = "DATA";
- content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB,
+ content::OpenURLParams params(dest_url(), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false);
params.uses_post = true;
params.post_data = content::ResourceRequestBody::CreateFromBytes(
@@ -3723,18 +3727,20 @@
// Open a new tab to navigate in.
ui_test_utils::NavigateToURLWithDisposition(
- current_browser(), GURL(url::kAboutBlankURL), NEW_FOREGROUND_TAB,
+ current_browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Now navigate in the new tab.
- NavigateToDestURLWithDisposition(CURRENT_TAB, false);
+ NavigateToDestURLWithDisposition(WindowOpenDisposition::CURRENT_TAB, false);
}
// Checks that prerenders honor |should_replace_current_entry|.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderReplaceCurrentEntry) {
PrerenderTestURL("/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
- content::OpenURLParams params(dest_url(), Referrer(), CURRENT_TAB,
+ content::OpenURLParams params(dest_url(), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false);
params.should_replace_current_entry = true;
NavigateToURLWithParams(params, false);
@@ -3934,7 +3940,7 @@
prerender->contents()->set_skip_final_checks(true);
// Navigate to the URL entered.
- omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
+ omnibox_view->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB, false);
// Prerender should be running, but abandoned.
EXPECT_TRUE(
diff --git a/chrome/browser/printing/cloud_print/privet_notifications.cc b/chrome/browser/printing/cloud_print/privet_notifications.cc
index 89652153..12d00f1 100644
--- a/chrome/browser/printing/cloud_print/privet_notifications.cc
+++ b/chrome/browser/printing/cloud_print/privet_notifications.cc
@@ -377,7 +377,7 @@
Profile* profile = Profile::FromBrowserContext(profile_);
chrome::NavigateParams params(profile, url,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index bdc280e..2491fef 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -80,10 +80,8 @@
browser->OpenURL(content::OpenURLParams(
google_util::AppendGoogleLocaleParam(
url, g_browser_process->GetApplicationLocale()),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_BOOKMARK,
- false));
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
new SignInObserver(web_contents, callback);
}
}
diff --git a/chrome/browser/printing/print_dialog_cloud_win.cc b/chrome/browser/printing/print_dialog_cloud_win.cc
index 5fa9f36f2..71f776b2 100644
--- a/chrome/browser/printing/print_dialog_cloud_win.cc
+++ b/chrome/browser/printing/print_dialog_cloud_win.cc
@@ -98,7 +98,7 @@
displayer.browser()->OpenURL(content::OpenURLParams(
google_util::AppendGoogleLocaleParam(
url, g_browser_process->GetApplicationLocale()),
- content::Referrer(), NEW_FOREGROUND_TAB,
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
if (data && data->size()) {
new PrintDataSetter(web_contents, data, print_job_title, print_ticket,
diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
index a9f65b3f..050ed536 100644
--- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
@@ -263,7 +263,7 @@
// Reload the initiator. Make sure reloading destroys the print preview
// dialog.
PrintPreviewDialogDestroyedObserver dialog_destroyed_observer(preview_dialog);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
ASSERT_TRUE(dialog_destroyed_observer.dialog_destroyed());
diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc
index e9a8f7f..98a4c83 100644
--- a/chrome/browser/profiles/host_zoom_map_browsertest.cc
+++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc
@@ -289,7 +289,7 @@
GURL test_url2 = ConstructTestServerURL(kTestURLTemplate2);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_url2, NEW_FOREGROUND_TAB,
+ browser(), test_url2, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_TRUE(
content::ZoomValuesEqual(default_zoom_level, GetZoomLevel(test_url2)));
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc
index 68df46d1..4f2482c9 100644
--- a/chrome/browser/push_messaging/push_messaging_browsertest.cc
+++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -791,7 +791,8 @@
// Open a blank foreground tab so site is no longer visible.
ui_test_utils::NavigateToURLWithDisposition(
- GetBrowser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
+ GetBrowser(), GURL("about:blank"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// If the Service Worker push event handler shows a notification, we
@@ -908,7 +909,8 @@
GetBrowser()->tab_strip_model()->GetActiveWebContents();
ui_test_utils::NavigateToURLWithDisposition(
- GetBrowser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
+ GetBrowser(), GURL("about:blank"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
SetSiteEngagementScore(web_contents->GetURL(), 0.0);
diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc
index bd96e69..17db565 100644
--- a/chrome/browser/referrer_policy_browsertest.cc
+++ b/chrome/browser/referrer_policy_browsertest.cc
@@ -188,7 +188,7 @@
tab->GetRenderViewHost()->GetWidget()->ForwardMouseEvent(mouse_event);
}
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
} else {
tab_added_observer.Wait();
@@ -239,123 +239,90 @@
// Content initiated navigation, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, Origin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- REGULAR_LINK,
- NO_REDIRECT,
- CURRENT_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::NoButton,
EXPECT_ORIGIN_AS_REFERRER);
}
// Content initiated navigation, from HTTPS to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsDefault) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- REGULAR_LINK,
- NO_REDIRECT,
- CURRENT_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::NoButton,
EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, LeftClickOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- REGULAR_LINK,
- NO_REDIRECT,
- CURRENT_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, from HTTPS to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsLeftClickOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- REGULAR_LINK,
- NO_REDIRECT,
- CURRENT_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, middle click, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- REGULAR_LINK,
- NO_REDIRECT,
- NEW_BACKGROUND_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_BACKGROUND_TAB,
blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, middle click, from HTTPS to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- REGULAR_LINK,
- NO_REDIRECT,
- NEW_BACKGROUND_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_BACKGROUND_TAB,
blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, target blank, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::Button::Left,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTP, LINK_WITH_TARGET_BLANK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, target blank, from HTTPS to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::Button::Left,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTPS, LINK_WITH_TARGET_BLANK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, middle click, target blank, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::Button::Middle,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTP, LINK_WITH_TARGET_BLANK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Middle, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, middle click, target blank, from HTTPS to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::Button::Middle,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTPS, LINK_WITH_TARGET_BLANK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Middle, EXPECT_ORIGIN_AS_REFERRER);
}
// Context menu, from HTTP to HTTP.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, ContextMenuOrigin) {
ContextMenuNotificationObserver context_menu_observer(
IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
- REGULAR_LINK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
blink::WebMouseEvent::Button::Right,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -364,52 +331,50 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsContextMenuOrigin) {
ContextMenuNotificationObserver context_menu_observer(
IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
- REGULAR_LINK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
+ RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ NO_REDIRECT, WindowOpenDisposition::NEW_FOREGROUND_TAB,
blink::WebMouseEvent::Button::Right,
EXPECT_ORIGIN_AS_REFERRER);
}
// Content initiated navigation, from HTTP to HTTP via server redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, Redirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, CURRENT_TAB,
- blink::WebMouseEvent::Button::NoButton,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
+ blink::WebMouseEvent::Button::NoButton, EXPECT_ORIGIN_AS_REFERRER);
}
// Content initiated navigation, from HTTPS to HTTP via server redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, CURRENT_TAB,
- blink::WebMouseEvent::Button::NoButton,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
+ blink::WebMouseEvent::Button::NoButton, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, from HTTP to HTTP via server redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, LeftClickRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTP_TO_HTTP, CURRENT_TAB,
- blink::WebMouseEvent::Button::Left,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
+ SERVER_REDIRECT_FROM_HTTP_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
+ blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, from HTTPS to HTTP via server redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsLeftClickRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, CURRENT_TAB,
- blink::WebMouseEvent::Button::Left,
- EXPECT_ORIGIN_AS_REFERRER);
+ RunReferrerTest(
+ blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
+ blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
}
// User initiated navigation, middle click, from HTTP to HTTP via server
// redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, NEW_BACKGROUND_TAB,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -418,7 +383,8 @@
// redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, NEW_BACKGROUND_TAB,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -428,7 +394,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP,
LINK_WITH_TARGET_BLANK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
- NEW_FOREGROUND_TAB, blink::WebMouseEvent::Button::Left,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -437,7 +404,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS,
LINK_WITH_TARGET_BLANK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
- NEW_FOREGROUND_TAB, blink::WebMouseEvent::Button::Left,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -446,7 +414,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickTargetBlankRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP,
LINK_WITH_TARGET_BLANK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
- NEW_FOREGROUND_TAB, blink::WebMouseEvent::Button::Middle,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -456,7 +425,8 @@
HttpsMiddleClickTargetBlankRedirect) {
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS,
LINK_WITH_TARGET_BLANK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
- NEW_FOREGROUND_TAB, blink::WebMouseEvent::Button::Middle,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ blink::WebMouseEvent::Button::Middle,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -465,7 +435,8 @@
ContextMenuNotificationObserver context_menu_observer(
IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, NEW_FOREGROUND_TAB,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
blink::WebMouseEvent::Button::Right,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -475,7 +446,8 @@
ContextMenuNotificationObserver context_menu_observer(
IDC_CONTENT_CONTEXT_OPENLINKNEWTAB);
RunReferrerTest(blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, NEW_FOREGROUND_TAB,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
blink::WebMouseEvent::Button::Right,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -486,7 +458,7 @@
// Navigate from A to B.
GURL start_url = RunReferrerTest(
blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, CURRENT_TAB,
+ SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
// Navigate to C.
@@ -504,21 +476,21 @@
AddAllPossibleTitles(start_url, title_watcher.get());
// Go back to B.
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
title_watcher.reset(new content::TitleWatcher(tab, expected_title));
AddAllPossibleTitles(start_url, title_watcher.get());
// Reload to B.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
title_watcher.reset(new content::TitleWatcher(tab, expected_title));
AddAllPossibleTitles(start_url, title_watcher.get());
// Shift-reload to B.
- chrome::ReloadBypassingCache(browser(), CURRENT_TAB);
+ chrome::ReloadBypassingCache(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_EQ(expected_title, title_watcher->WaitAndGetTitle());
}
@@ -527,7 +499,7 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, RequestTabletSite) {
GURL start_url = RunReferrerTest(
blink::WebReferrerPolicyOrigin, START_ON_HTTPS, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTP_TO_HTTP, CURRENT_TAB,
+ SERVER_REDIRECT_FROM_HTTP_TO_HTTP, WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER);
base::string16 expected_title =
@@ -603,7 +575,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest,
HttpLeftClickHTTPSRedirectToHTTPOriginWhenCrossOrigin) {
RunReferrerTest(blink::WebReferrerPolicyOriginWhenCrossOrigin, START_ON_HTTPS,
- REGULAR_LINK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP, CURRENT_TAB,
+ REGULAR_LINK, SERVER_REDIRECT_FROM_HTTPS_TO_HTTP,
+ WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -611,7 +584,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest,
HttpLeftClickRedirectToHTTPSOriginWhenCrossOrigin) {
RunReferrerTest(blink::WebReferrerPolicyOriginWhenCrossOrigin, START_ON_HTTP,
- REGULAR_LINK, SERVER_REDIRECT_FROM_HTTP_TO_HTTPS, CURRENT_TAB,
+ REGULAR_LINK, SERVER_REDIRECT_FROM_HTTP_TO_HTTPS,
+ WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left,
EXPECT_ORIGIN_AS_REFERRER);
}
@@ -619,7 +593,8 @@
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest,
HttpLeftClickRedirectToHTTPOriginWhenCrossOrigin) {
RunReferrerTest(blink::WebReferrerPolicyOriginWhenCrossOrigin, START_ON_HTTP,
- REGULAR_LINK, SERVER_REDIRECT_FROM_HTTP_TO_HTTP, CURRENT_TAB,
+ REGULAR_LINK, SERVER_REDIRECT_FROM_HTTP_TO_HTTP,
+ WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left, EXPECT_FULL_REFERRER);
}
@@ -628,7 +603,8 @@
// User initiated navigation, from HTTP to HTTPS via server redirect.
IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpLeftClickRedirectDefaultNoFlag) {
RunReferrerTest(blink::WebReferrerPolicyDefault, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTP_TO_HTTPS, CURRENT_TAB,
+ SERVER_REDIRECT_FROM_HTTP_TO_HTTPS,
+ WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left, EXPECT_FULL_REFERRER,
blink::WebReferrerPolicyNoReferrerWhenDowngrade);
}
@@ -639,7 +615,8 @@
blink::WebReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin;
RunReferrerTest(blink::WebReferrerPolicyDefault, START_ON_HTTP, REGULAR_LINK,
- SERVER_REDIRECT_FROM_HTTP_TO_HTTPS, CURRENT_TAB,
+ SERVER_REDIRECT_FROM_HTTP_TO_HTTPS,
+ WindowOpenDisposition::CURRENT_TAB,
blink::WebMouseEvent::Button::Left, EXPECT_ORIGIN_AS_REFERRER,
expected_referrer_policy);
}
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 10a3256..832f2a7c 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -373,7 +373,9 @@
int event_flags) {
WindowOpenDisposition disposition =
ui::DispositionFromEventFlags(event_flags);
- return disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition;
+ return disposition == WindowOpenDisposition::CURRENT_TAB
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : disposition;
}
// Returns the preference of the profile represented by the |context|.
@@ -484,7 +486,7 @@
Browser* browser = chrome::FindLastActiveWithProfile(profile);
chrome::NavigateParams nav_params(browser, link_url,
ui::PAGE_TRANSITION_LINK);
- nav_params.disposition = NEW_FOREGROUND_TAB;
+ nav_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
nav_params.referrer = referrer;
nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(&nav_params);
@@ -1674,12 +1676,12 @@
break;
case IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW:
- OpenURL(params_.link_url, GetDocumentURL(params_), NEW_WINDOW,
- ui::PAGE_TRANSITION_LINK);
+ OpenURL(params_.link_url, GetDocumentURL(params_),
+ WindowOpenDisposition::NEW_WINDOW, ui::PAGE_TRANSITION_LINK);
break;
case IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD:
- OpenURL(params_.link_url, GURL(), OFF_THE_RECORD,
+ OpenURL(params_.link_url, GURL(), WindowOpenDisposition::OFF_THE_RECORD,
ui::PAGE_TRANSITION_LINK);
break;
@@ -1715,8 +1717,8 @@
case IDC_CONTENT_CONTEXT_OPEN_ORIGINAL_IMAGE_NEW_TAB:
OpenURLWithExtraHeaders(
- params_.src_url, GetDocumentURL(params_), NEW_BACKGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
+ params_.src_url, GetDocumentURL(params_),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB, ui::PAGE_TRANSITION_LINK,
data_reduction_proxy::kDataReductionPassThroughHeader);
break;
@@ -1726,9 +1728,8 @@
case IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB:
case IDC_CONTENT_CONTEXT_OPENAVNEWTAB:
- OpenURL(params_.src_url,
- GetDocumentURL(params_),
- NEW_BACKGROUND_TAB,
+ OpenURL(params_.src_url, GetDocumentURL(params_),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui::PAGE_TRANSITION_LINK);
break;
@@ -2119,10 +2120,10 @@
void RenderViewContextMenu::ExecOpenLinkNewTab() {
Browser* browser = chrome::FindBrowserWithWebContents(source_web_contents_);
- OpenURL(params_.link_url,
- GetDocumentURL(params_),
- (!browser || browser->is_app()) ? NEW_FOREGROUND_TAB
- : NEW_BACKGROUND_TAB,
+ OpenURL(params_.link_url, GetDocumentURL(params_),
+ (!browser || browser->is_app())
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui::PAGE_TRANSITION_LINK);
}
diff --git a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc
index 0b8c3201..585aa5a 100644
--- a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc
+++ b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc
@@ -60,7 +60,8 @@
}
void SpellingBubbleModel::LinkClicked() {
- OpenURLParams params(GetLinkURL(), Referrer(), NEW_FOREGROUND_TAB,
+ OpenURLParams params(GetLinkURL(), Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
web_contents_->OpenURL(params);
}
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm
index ba51708..0165f04 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper.mm
@@ -377,9 +377,9 @@
historyOverlay_.view.window);
if (browser) {
if (direction == history_swiper::kForwards)
- chrome::GoForward(browser, CURRENT_TAB);
+ chrome::GoForward(browser, WindowOpenDisposition::CURRENT_TAB);
else
- chrome::GoBack(browser, CURRENT_TAB);
+ chrome::GoBack(browser, WindowOpenDisposition::CURRENT_TAB);
}
}
@@ -482,9 +482,9 @@
chrome::FindBrowserWithWindow(historyOverlay.view.window);
if (ended && browser) {
if (isRightScroll)
- chrome::GoForward(browser, CURRENT_TAB);
+ chrome::GoForward(browser, WindowOpenDisposition::CURRENT_TAB);
else
- chrome::GoBack(browser, CURRENT_TAB);
+ chrome::GoBack(browser, WindowOpenDisposition::CURRENT_TAB);
}
if (ended || isComplete) {
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
index 08c9406..5513106 100644
--- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
+++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -106,7 +106,7 @@
// renderer.
base::Process OpenBackgroundTab(const GURL& page) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), page, NEW_BACKGROUND_TAB,
+ browser(), page, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
TabStripModel* tab_strip = browser()->tab_strip_model();
@@ -280,7 +280,7 @@
// Create another omnibox tab. It should share the process with the other
// WebUI.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), omnibox, NEW_FOREGROUND_TAB,
+ browser(), omnibox, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
tab_count++;
EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
@@ -289,7 +289,7 @@
// Create another omnibox tab. It should share the process with the other
// WebUI.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), omnibox, NEW_FOREGROUND_TAB,
+ browser(), omnibox, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
tab_count++;
EXPECT_EQ(tab_count, browser()->tab_strip_model()->count());
@@ -514,7 +514,7 @@
ui_test_utils::NavigateToURL(browser(), url);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_BACKGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc
index e594e678..e3950669 100644
--- a/chrome/browser/repost_form_warning_browsertest.cc
+++ b/chrome/browser/repost_form_warning_browsertest.cc
@@ -75,7 +75,7 @@
content::Source<content::NavigationController>(&controller));
browser()->OpenURL(content::OpenURLParams(
embedded_test_server()->GetURL("/auth-basic"), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
observer.Wait();
// Try to reload it again.
@@ -86,7 +86,7 @@
// happen while the auth dialog is up.
content::TestNavigationObserver navigation_observer(web_contents);
browser()->OpenURL(content::OpenURLParams(
- embedded_test_server()->GetURL("/bar"), content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ embedded_test_server()->GetURL("/bar"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
navigation_observer.Wait();
}
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
index 6bdb383e..a9ae25f6 100644
--- a/chrome/browser/safe_browsing/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection_service.cc
@@ -1643,11 +1643,9 @@
learn_more_url, "ctx",
base::IntToString(static_cast<int>(item.GetDangerType())));
navigator->OpenURL(
- content::OpenURLParams(learn_more_url,
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ content::OpenURLParams(learn_more_url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
void DownloadProtectionService::SetDownloadPingToken(
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 24c479f7..9caf24f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -251,11 +251,9 @@
GURL learn_more_url(kLearnMore);
learn_more_url = google_util::AppendGoogleLocaleParam(
learn_more_url, g_browser_process->GetApplicationLocale());
- OpenURLParams params(learn_more_url,
- Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ OpenURLParams params(learn_more_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
web_contents()->OpenURL(params);
break;
}
@@ -316,9 +314,9 @@
unsafe_resource.threat_type ==
SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL ||
unsafe_resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED);
- OpenURLParams params(
- diagnostic_url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_LINK,
- false);
+ OpenURLParams params(diagnostic_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
web_contents()->OpenURL(params);
break;
}
@@ -335,7 +333,8 @@
GURL phishing_error_url(kReportPhishingErrorUrl);
phishing_error_url = google_util::AppendGoogleLocaleParam(
phishing_error_url, g_browser_process->GetApplicationLocale());
- OpenURLParams params(phishing_error_url, Referrer(), CURRENT_TAB,
+ OpenURLParams params(phishing_error_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_LINK, false);
web_contents()->OpenURL(params);
break;
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index b956982..286acd9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -454,9 +454,8 @@
// Trigger the safe browsing interstitial page via a redirect in
// "openWin()".
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("javascript:" + open_function + "()"),
- CURRENT_TAB,
+ browser(), GURL("javascript:" + open_function + "()"),
+ WindowOpenDisposition::CURRENT_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
WebContents* contents =
browser()->tab_strip_model()->GetActiveWebContents();
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 9b669989..be07ef6 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -1087,8 +1087,9 @@
&contents->GetController()));
// Start a browser initiated top-level navigation to a site that does not
// respond.
- ui_test_utils::NavigateToURLWithDisposition(browser(), third_url, CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), third_url, WindowOpenDisposition::CURRENT_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
// While the top-level navigation is pending, run javascript
// function in the page which loads the malware image.
diff --git a/chrome/browser/safe_browsing/srt_global_error_win.cc b/chrome/browser/safe_browsing/srt_global_error_win.cc
index f06dfe13..376230e 100644
--- a/chrome/browser/safe_browsing/srt_global_error_win.cc
+++ b/chrome/browser/safe_browsing/srt_global_error_win.cc
@@ -246,9 +246,10 @@
Browser* browser = chrome::FindLastActive();
if (browser) {
- browser->OpenURL(content::OpenURLParams(
- GURL(kSRTDownloadURL), content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ browser->OpenURL(
+ content::OpenURLParams(GURL(kSRTDownloadURL), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
BrowserThread::PostBlockingPoolTask(
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index 2e60e06..45c7ce0 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -710,9 +710,9 @@
if (!extension)
return;
- OpenApplication(
- AppLaunchParams(profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
+ OpenApplication(AppLaunchParams(
+ profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_CHROME_INTERNAL));
}
HotwordService::LaunchMode
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 1bc94036..963c712 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -201,7 +201,7 @@
0,
std::min(selected_index, static_cast<int>(tab.navigations.size() - 1)));
- bool use_new_window = disposition == NEW_WINDOW;
+ bool use_new_window = disposition == WindowOpenDisposition::NEW_WINDOW;
Browser* browser =
use_new_window
@@ -211,7 +211,7 @@
RecordAppLaunchForTab(browser, tab, selected_index);
WebContents* web_contents;
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
DCHECK(!use_new_window);
web_contents = chrome::ReplaceRestoredTab(
browser, tab.navigations, selected_index, true, tab.extension_app_id,
@@ -222,7 +222,7 @@
web_contents = chrome::AddRestoredTab(
browser, tab.navigations, tab_index, selected_index,
tab.extension_app_id,
- disposition == NEW_FOREGROUND_TAB, // selected
+ disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB, // selected
tab.pinned, true, nullptr, tab.user_agent_override);
// Start loading the tab immediately.
web_contents->GetController().LoadIfNecessary();
@@ -663,7 +663,8 @@
add_types |= TabStripModel::ADD_ACTIVE;
chrome::NavigateParams params(browser, urls[i],
ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
- params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+ params.disposition = i == 0 ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.tabstrip_add_types = add_types;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/sessions/session_restore_android.cc b/chrome/browser/sessions/session_restore_android.cc
index 812d85b..68b3734e 100644
--- a/chrome/browser/sessions/session_restore_android.cc
+++ b/chrome/browser/sessions/session_restore_android.cc
@@ -43,12 +43,12 @@
TabAndroid* current_tab = TabAndroid::FromWebContents(web_contents);
DCHECK(current_tab);
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
current_tab->SwapTabContents(web_contents, new_web_contents, false, false);
delete web_contents;
} else {
- DCHECK(disposition == NEW_FOREGROUND_TAB ||
- disposition == NEW_BACKGROUND_TAB);
+ DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
tab_model->CreateTab(current_tab, new_web_contents,
current_tab->GetAndroidId());
}
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index fc3ad3d0..b9c308e 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -162,14 +162,14 @@
void GoBack(Browser* browser) {
content::TestNavigationObserver observer(
browser->tab_strip_model()->GetActiveWebContents());
- chrome::GoBack(browser, CURRENT_TAB);
+ chrome::GoBack(browser, WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
void GoForward(Browser* browser) {
content::TestNavigationObserver observer(
browser->tab_strip_model()->GetActiveWebContents());
- chrome::GoForward(browser, CURRENT_TAB);
+ chrome::GoForward(browser, WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
@@ -273,14 +273,12 @@
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoredTabsShouldHaveWindow) {
// Create tabs.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_BACKGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restart and session restore the tabs.
@@ -309,10 +307,10 @@
GURL test_page(ui_test_utils::GetTestUrl(base::FilePath(),
base::FilePath(FILE_PATH_LITERAL("tab-restore-visibility.html"))));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_page, NEW_FOREGROUND_TAB,
+ browser(), test_page, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_page, NEW_BACKGROUND_TAB,
+ browser(), test_page, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restart and session restore the tabs.
@@ -351,10 +349,10 @@
base::FilePath(),
base::FilePath(FILE_PATH_LITERAL("tab-restore-visibility.html"))));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_page, NEW_FOREGROUND_TAB,
+ browser(), test_page, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_page, NEW_BACKGROUND_TAB,
+ browser(), test_page, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restart and session restore the tabs.
@@ -557,8 +555,8 @@
if (tab.navigations[0].virtual_url() == url2) {
timestamp = tab.navigations[0].timestamp();
http_status_code = tab.navigations[0].http_status_code();
- std::vector<sessions::LiveTab*> content =
- service->RestoreEntryById(NULL, tab.id, UNKNOWN);
+ std::vector<sessions::LiveTab*> content = service->RestoreEntryById(
+ NULL, tab.id, WindowOpenDisposition::UNKNOWN);
ASSERT_EQ(1U, content.size());
sessions::ContentLiveTab* live_tab =
static_cast<sessions::ContentLiveTab*>(content[0]);
@@ -620,7 +618,7 @@
// Restore the tab.
std::vector<sessions::LiveTab*> content =
- service->RestoreEntryById(NULL, tab->id, UNKNOWN);
+ service->RestoreEntryById(NULL, tab->id, WindowOpenDisposition::UNKNOWN);
ASSERT_EQ(1U, content.size());
ASSERT_TRUE(content[0]);
EXPECT_EQ(url, static_cast<sessions::ContentLiveTab*>(content[0])
@@ -714,7 +712,8 @@
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
tab_content = SessionRestore::RestoreForeignSessionTab(
- browser()->tab_strip_model()->GetActiveWebContents(), tab, CURRENT_TAB);
+ browser()->tab_strip_model()->GetActiveWebContents(), tab,
+ WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
ASSERT_EQ(1, browser()->tab_strip_model()->count());
@@ -732,8 +731,8 @@
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
tab_content = SessionRestore::RestoreForeignSessionTab(
- browser()->tab_strip_model()->GetActiveWebContents(),
- tab, NEW_BACKGROUND_TAB);
+ browser()->tab_strip_model()->GetActiveWebContents(), tab,
+ WindowOpenDisposition::NEW_BACKGROUND_TAB);
observer.Wait();
}
ASSERT_EQ(2, browser()->tab_strip_model()->count());
@@ -753,7 +752,8 @@
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
tab_content = SessionRestore::RestoreForeignSessionTab(
- browser()->tab_strip_model()->GetActiveWebContents(), tab, NEW_WINDOW);
+ browser()->tab_strip_model()->GetActiveWebContents(), tab,
+ WindowOpenDisposition::NEW_WINDOW);
new_browser = browser_observer.WaitForSingleNewBrowser();
observer.Wait();
}
@@ -862,14 +862,12 @@
// Add several tabs to the browser. Restart the browser and check that all
// tabs got loaded properly.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
Browser* restored =
QuitBrowserAndRestoreWithURL(browser(), 1, GURL(), true);
@@ -889,14 +887,12 @@
// Add several tabs to the browser. Restart the browser and check that all
// tabs got loaded properly.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restore the brwoser, but instead of directly waiting, we issue a critical
// memory pressure event and finish then the loading.
@@ -1016,7 +1012,7 @@
ui_test_utils::NavigateToURL(browser(), url1_);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
Browser* new_browser = QuitBrowserAndRestore(browser(), 2);
@@ -1036,7 +1032,7 @@
ui_test_utils::NavigateToURL(browser(), url1_);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
chrome::CloseTab(browser());
@@ -1051,10 +1047,10 @@
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ActiveIndexUpdatedAtClose) {
ui_test_utils::NavigateToURL(browser(), url1_);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url3_, NEW_BACKGROUND_TAB,
+ browser(), url3_, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
browser()->tab_strip_model()->CloseWebContentsAt(
@@ -1072,13 +1068,13 @@
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ActiveIndexUpdatedAtInsert) {
ui_test_utils::NavigateToURL(browser(), url1_);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_BACKGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
chrome::NavigateParams navigate_params(browser(), url3_,
ui::PAGE_TRANSITION_TYPED);
navigate_params.tabstrip_index = 0;
- navigate_params.disposition = NEW_BACKGROUND_TAB;
+ navigate_params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
ui_test_utils::NavigateToURL(&navigate_params);
Browser* new_browser = QuitBrowserAndRestore(browser(), 3);
@@ -1131,9 +1127,7 @@
// Open a second window.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_WINDOW,
+ browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
ASSERT_EQ(2u, active_browser_list_->size());
@@ -1166,14 +1160,12 @@
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ShareProcessesOnRestore) {
// Create two new tabs.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url::kAboutBlankURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
int expected_process_count = RenderProcessHostCount();
@@ -1196,7 +1188,7 @@
// Create a tab without an overridden user agent.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
@@ -1226,7 +1218,7 @@
ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
// Create a nonpinned tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
// Select the pinned tab.
@@ -1268,7 +1260,7 @@
// Create 2 tabs.
ui_test_utils::NavigateToURL(browser(), url1_);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restore the session by calling chrome::Navigate().
@@ -1326,7 +1318,7 @@
ui_test_utils::NavigateToURL(browser(), url1_);
ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(1, browser()->tab_strip_model()->active_index());
Profile* profile = browser()->profile();
@@ -1425,7 +1417,7 @@
ui_test_utils::NavigateToURL(browser(), GURL(kUrls[0]));
for (size_t i = 1; i < kExpectedNumTabs; i++) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(kUrls[i]), NEW_FOREGROUND_TAB,
+ browser(), GURL(kUrls[i]), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index a5b85a4..91c8c8ce 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -107,7 +107,7 @@
for (int i = 0; i < how_many; ++i) {
ui_test_utils::NavigateToURLWithDisposition(
- browser, url1_, NEW_FOREGROUND_TAB,
+ browser, url1_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
int tab_count = browser->tab_strip_model()->count();
@@ -179,7 +179,7 @@
content::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
- chrome::GoBack(browser, CURRENT_TAB);
+ chrome::GoBack(browser, WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
@@ -256,7 +256,8 @@
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(2u, active_browser_list_->size());
@@ -280,7 +281,8 @@
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(2u, active_browser_list_->size());
@@ -343,7 +345,8 @@
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(2u, active_browser_list_->size());
@@ -372,16 +375,17 @@
// both. Make sure both restored tabs are in the same window.
IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url1_, NEW_FOREGROUND_TAB,
+ browser(), url1_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Navigate the rightmost one to url2_ for easier identification.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(2u, active_browser_list_->size());
@@ -415,15 +419,16 @@
// one by ID. Guards against regression of crbug.com/622752.
IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabFromClosedWindowByID) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url1_, NEW_FOREGROUND_TAB,
+ browser(), url1_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(2u, active_browser_list_->size());
@@ -470,7 +475,7 @@
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
service->RestoreEntryById(browser->live_tab_context(), tab_id_to_restore,
- NEW_FOREGROUND_TAB);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB);
tab_added_observer.Wait();
tab_loaded_observer.Wait();
@@ -491,7 +496,7 @@
// Add a tab
ui_test_utils::NavigateToURLWithDisposition(
- browser(), http_url1, NEW_FOREGROUND_TAB,
+ browser(), http_url1, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(++tab_count, browser()->tab_strip_model()->count());
@@ -502,9 +507,9 @@
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
static_cast<content::WebContentsDelegate*>(browser())->OpenURLFromTab(
- tab,
- content::OpenURLParams(http_url2, content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ tab, content::OpenURLParams(http_url2, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
observer.Wait();
// Close the tab.
@@ -514,7 +519,7 @@
// enabled, this will ensure that the SiteInstance used by the restored tab
// will already exist when the restore happens.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), http_url2, NEW_FOREGROUND_TAB,
+ browser(), http_url2, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restore the closed tab.
@@ -551,7 +556,7 @@
// Add a tab
ui_test_utils::NavigateToURLWithDisposition(
- browser(), http_url1, NEW_FOREGROUND_TAB,
+ browser(), http_url1, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(++tab_count, browser()->tab_strip_model()->count());
@@ -567,7 +572,7 @@
// enabled, this will ensure that the SiteInstance will already exist when
// the user clicks Back in the restored tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), http_url2, NEW_FOREGROUND_TAB,
+ browser(), http_url2, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Restore the closed tab.
@@ -592,17 +597,18 @@
// Create a new window.
size_t window_count = active_browser_list_->size();
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
EXPECT_EQ(++window_count, active_browser_list_->size());
// Create two more tabs, one with url1, the other url2.
int initial_tab_count = browser()->tab_strip_model()->count();
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url1_, NEW_FOREGROUND_TAB,
+ browser(), url1_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url2_, NEW_FOREGROUND_TAB,
+ browser(), url2_, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Close the window.
@@ -644,7 +650,8 @@
IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabWithSpecialURL) {
// Navigate new tab to a special URL.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUICreditsURL), NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUICreditsURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Close the tab.
@@ -671,7 +678,8 @@
// Navigate new tab to a special URL.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUICreditsURL), NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUICreditsURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Then navigate to a normal URL.
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc
index 6787db2f6..118d9c87 100644
--- a/chrome/browser/signin/chrome_signin_helper.cc
+++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -84,9 +84,9 @@
GURL url(manage_accounts_params.continue_url.empty()
? chrome::kChromeUINativeNewTabURL
: manage_accounts_params.continue_url);
- web_contents->OpenURL(
- content::OpenURLParams(url, content::Referrer(), OFF_THE_RECORD,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
+ web_contents->OpenURL(content::OpenURLParams(
+ url, content::Referrer(), WindowOpenDisposition::OFF_THE_RECORD,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
} else {
signin_metrics::LogAccountReconcilorStateOnGaiaResponse(
account_reconcilor->GetState());
diff --git a/chrome/browser/signin/easy_unlock_app_manager.cc b/chrome/browser/signin/easy_unlock_app_manager.cc
index 32a353a..22b3a149 100644
--- a/chrome/browser/signin/easy_unlock_app_manager.cc
+++ b/chrome/browser/signin/easy_unlock_app_manager.cc
@@ -89,7 +89,7 @@
OpenApplication(AppLaunchParams(extension_service->profile(), extension,
extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW,
extensions::SOURCE_CHROME_INTERNAL));
}
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 161e1146..cc51491 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -177,7 +177,7 @@
"https://support.google.com/chrome/answer/1181420?";
chrome::NavigateParams params(
profile, GURL(kSigninErrorLearnMoreUrl), ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
index 16508c0..359ed95 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
@@ -853,7 +853,7 @@
// security state is neutral while the page is loading.
browser()->OpenURL(content::OpenURLParams(
embedded_test_server()->GetURL("/title1.html"), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
CheckSecurityInfoForNonSecure(
browser()->tab_strip_model()->GetActiveWebContents());
}
@@ -1086,7 +1086,7 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<content::NavigationController>(
&web_contents->GetController()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
back_nav_load_observer.Wait();
EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED,
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 171f831..f3e01a6 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -1053,7 +1053,7 @@
ProvisionalLoadWaiter load_failed_observer(tab);
// Simulate user clicking on back button (crbug.com/39248).
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
// Wait until we hear the load failure, and make sure we haven't changed
// the previous RFH. Prevents regression of http://crbug.com/82667.
@@ -1481,7 +1481,7 @@
SSLBlockingPage::kTypeForTesting,
tab->GetInterstitialPage()->GetDelegateForTesting()->GetTypeForTesting());
EXPECT_TRUE(chrome::CanGoBack(browser()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
dangerous_download_observer.WaitForFinished();
}
@@ -1767,7 +1767,7 @@
GURL url = https_server_.GetURL(replacement_path);
chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.tabstrip_index = 0;
params.source_contents = tab1;
content::WindowedNotificationObserver observer(
@@ -1809,7 +1809,7 @@
// because we are using process-per-site in SetUpCommandLine.
GURL url = https_server_.GetURL(replacement_path);
chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_TYPED);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.source_contents = tab1;
content::WindowedNotificationObserver observer(
content::NOTIFICATION_LOAD_STOP,
@@ -2935,8 +2935,8 @@
SSLInterstitialTimerObserver interstitial_timer_observer(contents);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), https_server_mismatched_url, CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), https_server_mismatched_url,
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
interstitial_timer_observer.WaitForTimerStarted();
EXPECT_TRUE(contents->IsLoading());
@@ -3003,13 +3003,13 @@
SSLInterstitialTimerObserver interstitial_timer_observer(contents);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), https_server_mismatched_url, CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), https_server_mismatched_url,
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
interstitial_timer_observer.WaitForTimerStarted();
EXPECT_TRUE(contents->IsLoading());
content::TestNavigationObserver observer(contents, 1);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
SSLErrorHandler* ssl_error_handler =
@@ -3069,15 +3069,15 @@
SSLInterstitialTimerObserver interstitial_timer_observer(contents);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), https_server_mismatched_url, CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), https_server_mismatched_url,
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
interstitial_timer_observer.WaitForTimerStarted();
EXPECT_TRUE(contents->IsLoading());
content::TestNavigationObserver observer(contents, 1);
- browser()->OpenURL(content::OpenURLParams(GURL("https://google.com"),
- content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(content::OpenURLParams(
+ GURL("https://google.com"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
observer.Wait();
SSLErrorHandler* ssl_error_handler =
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 5666213a..44c900d 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -206,7 +206,7 @@
// Open blocked URL in a new tab.
GURL test_url("http://www.example.com/simple.html");
ui_test_utils::NavigateToURLWithDisposition(
- browser(), test_url, NEW_FOREGROUND_TAB,
+ browser(), test_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Check that we got the interstitial.
diff --git a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc
index 21c221f..c4c58526 100644
--- a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc
+++ b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc
@@ -65,12 +65,10 @@
for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
chrome::SelectNumberedTab(browser, i);
url = NextURL();
- browser->OpenURL(
- OpenURLParams(url,
- content::Referrer(GURL("http://localhost"),
- blink::WebReferrerPolicyDefault),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ browser->OpenURL(OpenURLParams(
+ url, content::Referrer(GURL("http://localhost"),
+ blink::WebReferrerPolicyDefault),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false));
urls.push_back(url);
}
WaitForTabsToLoad(profile, urls);
diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc
index b4740b5e..89e2bf4 100644
--- a/chrome/browser/tab_contents/view_source_browsertest.cc
+++ b/chrome/browser/tab_contents/view_source_browsertest.cc
@@ -168,7 +168,7 @@
{
ui_test_utils::UrlLoadObserver load_complete(
url_viewsource, content::NotificationService::AllSources());
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
load_complete.Wait();
}
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 926845ff..af574621 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -246,7 +246,7 @@
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
// Tab should reappear in task manager upon reload.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html")));
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
}
@@ -299,7 +299,8 @@
// Now navigate this tab to a different site. This should wind up in a
// different renderer process, so it should complete and show up in the task
// manager.
- tab2->OpenURL(content::OpenURLParams(url3, content::Referrer(), CURRENT_TAB,
+ tab2->OpenURL(content::OpenURLParams(url3, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
@@ -748,7 +749,7 @@
GURL main_url(embedded_test_server()->GetURL(
"/cross-site/a.com/iframe_cross_site.html"));
browser()->OpenURL(content::OpenURLParams(main_url, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
@@ -804,7 +805,7 @@
GURL a_dotcom(embedded_test_server()->GetURL(
"/cross-site/a.com/iframe_cross_site.html"));
browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
@@ -827,7 +828,7 @@
embedded_test_server()->GetURL("/cross-site/b.com/iframe.html"));
browser()->OpenURL(content::OpenURLParams(b_dotcom, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
@@ -850,7 +851,7 @@
embedded_test_server()->GetURL("/cross-site/b.com/iframe.html"));
browser()->OpenURL(content::OpenURLParams(b_dotcom, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("iframe test")));
@@ -862,7 +863,7 @@
GURL a_dotcom(embedded_test_server()->GetURL(
"/cross-site/a.com/iframe_cross_site.html"));
browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
@@ -904,7 +905,7 @@
GURL a_dotcom(embedded_test_server()->GetURL(
"/cross-site/a.com/iframe_cross_site.html"));
browser()->OpenURL(content::OpenURLParams(a_dotcom, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
@@ -963,9 +964,9 @@
// Navigate the tab to a page on a.com with cross-process subframes.
GURL a_dotcom_with_iframes(embedded_test_server()->GetURL(
"/cross-site/a.com/iframe_cross_site.html"));
- browser()->OpenURL(content::OpenURLParams(a_dotcom_with_iframes,
- content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(content::OpenURLParams(
+ a_dotcom_with_iframes, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
WaitForTaskManagerRows(1, MatchTab("cross-site iframe test")));
@@ -985,9 +986,9 @@
// the subframe processes should disappear.
GURL a_dotcom_simple(
embedded_test_server()->GetURL("/cross-site/a.com/title2.html"));
- browser()->OpenURL(content::OpenURLParams(a_dotcom_simple,
- content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(content::OpenURLParams(
+ a_dotcom_simple, content::Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
@@ -1006,7 +1007,7 @@
GURL a_with_frames(embedded_test_server()->GetURL(
"a.com", "/cross_site_iframe_factory.html?a(b,b,c(d,a,b,c))"));
browser()->OpenURL(content::OpenURLParams(a_with_frames, content::Referrer(),
- CURRENT_TAB,
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
if (ShouldExpectSubframes()) {
@@ -1034,9 +1035,10 @@
// Opening a new tab should appear below the existing tab.
GURL other_tab_url(embedded_test_server()->GetURL(
"d.com", "/cross_site_iframe_factory.html?d(a(c(b)))"));
- browser()->OpenURL(content::OpenURLParams(other_tab_url, content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(
+ content::OpenURLParams(other_tab_url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
ASSERT_NO_FATAL_FAILURE(
WaitForTaskManagerRows(2, MatchTab("Cross-site iframe factory")));
diff --git a/chrome/browser/ui/android/bluetooth_chooser_android.cc b/chrome/browser/ui/android/bluetooth_chooser_android.cc
index 034624e6..61116924 100644
--- a/chrome/browser/ui/android/bluetooth_chooser_android.cc
+++ b/chrome/browser/ui/android/bluetooth_chooser_android.cc
@@ -174,6 +174,6 @@
void BluetoothChooserAndroid::OpenURL(const char* url) {
web_contents_->OpenURL(content::OpenURLParams(
- GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
+ GURL(url), content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */));
}
diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.cc b/chrome/browser/ui/android/infobars/confirm_infobar.cc
index 2b5b5f7..d5ffed45 100644
--- a/chrome/browser/ui/android/infobars/confirm_infobar.cc
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.cc
@@ -76,7 +76,7 @@
if (!owner())
return; // We're closing; don't call anything, it might access the owner.
- if (GetDelegate()->LinkClicked(NEW_FOREGROUND_TAB))
+ if (GetDelegate()->LinkClicked(WindowOpenDisposition::NEW_FOREGROUND_TAB))
RemoveSelf();
}
diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.cc b/chrome/browser/ui/android/infobars/save_password_infobar.cc
index f3592e2..0f285bb 100644
--- a/chrome/browser/ui/android/infobars/save_password_infobar.cc
+++ b/chrome/browser/ui/android/infobars/save_password_infobar.cc
@@ -45,7 +45,7 @@
void SavePasswordInfoBar::OnLinkClicked(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
- GetDelegate()->LinkClicked(NEW_FOREGROUND_TAB);
+ GetDelegate()->LinkClicked(WindowOpenDisposition::NEW_FOREGROUND_TAB);
}
std::unique_ptr<infobars::InfoBar> CreateSavePasswordInfoBar(
diff --git a/chrome/browser/ui/android/infobars/update_password_infobar.cc b/chrome/browser/ui/android/infobars/update_password_infobar.cc
index 39591563..f81853a95 100644
--- a/chrome/browser/ui/android/infobars/update_password_infobar.cc
+++ b/chrome/browser/ui/android/infobars/update_password_infobar.cc
@@ -62,5 +62,5 @@
void UpdatePasswordInfoBar::OnLinkClicked(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
- GetDelegate()->LinkClicked(NEW_FOREGROUND_TAB);
+ GetDelegate()->LinkClicked(WindowOpenDisposition::NEW_FOREGROUND_TAB);
}
diff --git a/chrome/browser/ui/android/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
index c9d8b91..c779222b2ae 100644
--- a/chrome/browser/ui/android/usb_chooser_dialog_android.cc
+++ b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
@@ -218,10 +218,11 @@
void UsbChooserDialogAndroid::OpenUrl(const std::string& url) {
content::WebContents::FromRenderFrameHost(render_frame_host_)
- ->OpenURL(content::OpenURLParams(GURL(url), content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false)); // is_renderer_initiated
+ ->OpenURL(
+ content::OpenURLParams(GURL(url), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ false)); // is_renderer_initiated
}
bool UsbChooserDialogAndroid::DisplayDevice(
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
index 8127a3e2d..17140ef 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc
@@ -143,12 +143,9 @@
is_search_result ?
AppListControllerDelegate::LAUNCH_FROM_APP_LIST_SEARCH :
AppListControllerDelegate::LAUNCH_FROM_APP_LIST);
- OpenURL(profile,
- net::AppendQueryParameter(url,
- extension_urls::kWebstoreSourceField,
- source),
- ui::PAGE_TRANSITION_LINK,
- CURRENT_TAB);
+ OpenURL(profile, net::AppendQueryParameter(
+ url, extension_urls::kWebstoreSourceField, source),
+ ui::PAGE_TRANSITION_LINK, WindowOpenDisposition::CURRENT_TAB);
}
bool AppListControllerDelegate::HasOptionsPage(
@@ -166,10 +163,8 @@
if (!extension)
return;
- OpenURL(profile,
- extensions::OptionsPageInfo::GetOptionsPage(extension),
- ui::PAGE_TRANSITION_LINK,
- CURRENT_TAB);
+ OpenURL(profile, extensions::OptionsPageInfo::GetOptionsPage(extension),
+ ui::PAGE_TRANSITION_LINK, WindowOpenDisposition::CURRENT_TAB);
}
extensions::LaunchType AppListControllerDelegate::GetExtensionLaunchType(
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
index 053a6476..40b0040 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc
@@ -115,7 +115,8 @@
AppListServiceImpl::RecordAppListAppLaunch();
AppLaunchParams params = CreateAppLaunchParamsUserContainer(
- profile, extension, NEW_FOREGROUND_TAB, extensions::SOURCE_APP_LAUNCHER);
+ profile, extension, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ extensions::SOURCE_APP_LAUNCHER);
if (source != LAUNCH_FROM_UNKNOWN &&
extension->id() == extensions::kWebStoreAppId) {
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
index 3196888..272c29a 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -528,9 +528,8 @@
chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
content::OpenURLParams params(GURL(chrome::kAppLauncherHelpURL),
content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
displayer.browser()->OpenURL(params);
}
@@ -761,7 +760,8 @@
void AppListViewDelegate::OpenLearnMoreLink() {
controller_->OpenURL(profile_, GURL(GetLearnMoreLink()),
- ui::PAGE_TRANSITION_LINK, CURRENT_TAB);
+ ui::PAGE_TRANSITION_LINK,
+ WindowOpenDisposition::CURRENT_TAB);
}
#endif // !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
index e94c8d2..a8bd07a 100644
--- a/chrome/browser/ui/app_list/start_page_service.cc
+++ b/chrome/browser/ui/app_list/start_page_service.cc
@@ -182,15 +182,11 @@
chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
// Force all links to open in a new tab, even if they were trying to open a
// new window.
- disposition =
- disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB;
- chrome::AddWebContents(displayer.browser(),
- nullptr,
- new_contents,
- disposition,
- initial_pos,
- user_gesture,
- was_blocked);
+ disposition = disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB
+ ? disposition
+ : WindowOpenDisposition::NEW_FOREGROUND_TAB;
+ chrome::AddWebContents(displayer.browser(), nullptr, new_contents,
+ disposition, initial_pos, user_gesture, was_blocked);
}
content::WebContents* OpenURLFromTab(
@@ -200,10 +196,10 @@
// window.
chrome::NavigateParams new_tab_params(
static_cast<Browser*>(nullptr), params.url, params.transition);
- if (params.disposition == NEW_BACKGROUND_TAB) {
- new_tab_params.disposition = NEW_BACKGROUND_TAB;
+ if (params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB) {
+ new_tab_params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
} else {
- new_tab_params.disposition = NEW_FOREGROUND_TAB;
+ new_tab_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
new_tab_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
}
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index bf65365..1bd2086 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -66,10 +66,10 @@
// window.
chrome::NavigateParams new_tab_params(
static_cast<Browser*>(NULL), params.url, params.transition);
- if (params.disposition == NEW_BACKGROUND_TAB) {
- new_tab_params.disposition = NEW_BACKGROUND_TAB;
+ if (params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB) {
+ new_tab_params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
} else {
- new_tab_params.disposition = NEW_FOREGROUND_TAB;
+ new_tab_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
new_tab_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
}
@@ -244,8 +244,9 @@
Profile::FromBrowserContext(context));
// Force all links to open in a new tab, even if they were trying to open a
// new window.
- disposition =
- disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB;
+ disposition = disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB
+ ? disposition
+ : WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::AddWebContents(displayer.browser(),
NULL,
new_contents,
diff --git a/chrome/browser/ui/ash/cast_config_delegate_chromeos.cc b/chrome/browser/ui/ash/cast_config_delegate_chromeos.cc
index 462d8081..1860200 100644
--- a/chrome/browser/ui/ash/cast_config_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/cast_config_delegate_chromeos.cc
@@ -109,7 +109,7 @@
ProfileManager::GetActiveUserProfile(),
FindCastExtension()->GetResourceURL("options.html"),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate.cc b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
index 68ac5df..57088d9 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
@@ -133,7 +133,8 @@
const extensions::Extension* const extension =
service->GetInstalledExtension(kFileManagerAppId);
OpenApplication(CreateAppLaunchParamsUserContainer(
- profile, extension, NEW_FOREGROUND_TAB, extensions::SOURCE_KEYBOARD));
+ profile, extension, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ extensions::SOURCE_KEYBOARD));
}
void ChromeNewWindowDelegate::OpenCrosh() {
@@ -144,9 +145,9 @@
return;
chrome::ScopedTabbedBrowserDisplayer displayer(profile);
Browser* browser = displayer.browser();
- content::WebContents* page = browser->OpenURL(
- content::OpenURLParams(crosh_url, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_GENERATED, false));
+ content::WebContents* page = browser->OpenURL(content::OpenURLParams(
+ crosh_url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_GENERATED, false));
browser->window()->Show();
browser->window()->Activate();
page->Focus();
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 962435d..c4e185a 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -466,7 +466,7 @@
chrome::NavigateParams params(browser, GURL(kKeyboardShortcutHelpPageUrl),
ui::PAGE_TRANSITION_AUTO_BOOKMARK);
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index c128427..24e15b5 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -873,7 +873,7 @@
TabStripModel* tab_strip = browser()->tab_strip_model();
int tab_count = tab_strip->count();
LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
- NEW_FOREGROUND_TAB);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB);
EXPECT_EQ(++tab_count, tab_strip->count());
ash::ShelfID shortcut_id = CreateShortcut("app1");
EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
@@ -891,7 +891,7 @@
TabStripModel* tab_strip = browser()->tab_strip_model();
int tab_count = tab_strip->count();
LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
- NEW_BACKGROUND_TAB);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB);
EXPECT_EQ(++tab_count, tab_strip->count());
controller_->LaunchApp(last_loaded_extension_id(),
ash::LAUNCH_FROM_UNKNOWN,
@@ -935,13 +935,9 @@
const Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("app1"));
- controller_->ActivateApp(extension->id(),
- ash::LAUNCH_FROM_UNKNOWN,
- 0);
+ controller_->ActivateApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
- controller_->ActivateApp(extension->id(),
- ash::LAUNCH_FROM_UNKNOWN,
- 0);
+ controller_->ActivateApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
EXPECT_EQ(tab_count, tab_strip->count());
}
@@ -952,13 +948,9 @@
const Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("app1"));
- controller_->LaunchApp(extension->id(),
- ash::LAUNCH_FROM_UNKNOWN,
- 0);
+ controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
- controller_->LaunchApp(extension->id(),
- ash::LAUNCH_FROM_UNKNOWN,
- 0);
+ controller_->LaunchApp(extension->id(), ash::LAUNCH_FROM_UNKNOWN, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
}
@@ -995,10 +987,8 @@
// Open second tab for second app. This should activate it.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path3/foo.html"),
- NEW_FOREGROUND_TAB,
- 0);
+ browser(), GURL("http://www.example.com/path3/foo.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
EXPECT_EQ(ash::STATUS_RUNNING, (*model_->ItemByID(shortcut1)).status);
EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut2)).status);
@@ -1091,9 +1081,8 @@
// Create new tab owned by app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path2/bar.html"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.example.com/path2/bar.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(++tab_count, tab_strip->count());
// Confirm app is still active.
@@ -1101,10 +1090,8 @@
// Create new tab not owned by app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path3/foo.html"),
- NEW_FOREGROUND_TAB,
- 0);
+ browser(), GURL("http://www.example.com/path3/foo.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
// No longer active.
EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(shortcut_id)->status);
@@ -1128,9 +1115,8 @@
shortcut_id, GURL("http://www.example.com/path1/*"));
// Create new tab owned by app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path2/bar.html"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.example.com/path2/bar.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(++tab_count, tab_strip->count());
// Confirm app is still active.
@@ -1138,10 +1124,8 @@
// Create new tab not owned by app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path3/foo.html"),
- NEW_FOREGROUND_TAB,
- 0);
+ browser(), GURL("http://www.example.com/path3/foo.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
EXPECT_EQ(++tab_count, tab_strip->count());
// No longer active.
EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(shortcut_id)->status);
@@ -1162,9 +1146,8 @@
// Create new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example2.com/path2/bar.html"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.example2.com/path2/bar.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(++tab_count, tab_strip->count());
WebContents* first_tab = tab_strip->GetActiveWebContents();
@@ -1200,9 +1183,8 @@
// Create new tab which would be the running app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path1/bar.html"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.example.com/path1/bar.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// There should never be two items active at the same time.
@@ -1236,9 +1218,8 @@
// Create new tab which would be the running app.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.example.com/path1/bar.html"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.example.com/path1/bar.html"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(shortcut_id)->status);
@@ -1257,8 +1238,9 @@
// before it was closed.
IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, AppWindowRestoreBehaviorTest) {
// Open an App, maximized its window, and close it.
- const Extension* extension = LoadAndLaunchExtension(
- "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+ const Extension* extension =
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW);
Browser* app_browser = FindBrowserForApp(extension->id());
ASSERT_TRUE(app_browser);
aura::Window* window = app_browser->window()->GetNativeWindow();
@@ -1268,8 +1250,9 @@
CloseAppBrowserWindow(app_browser);
// Reopen the App. It should start maximized. Un-maximize it and close it.
- extension = LoadAndLaunchExtension(
- "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+ extension =
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW);
app_browser = FindBrowserForApp(extension->id());
ASSERT_TRUE(app_browser);
window = app_browser->window()->GetNativeWindow();
@@ -1281,8 +1264,9 @@
CloseAppBrowserWindow(app_browser);
// Reopen the App. It should start un-maximized.
- extension = LoadAndLaunchExtension(
- "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+ extension =
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW);
app_browser = FindBrowserForApp(extension->id());
ASSERT_TRUE(app_browser);
window = app_browser->window()->GetNativeWindow();
@@ -1298,14 +1282,15 @@
EXPECT_EQ(0u, items);
EXPECT_EQ(0u, running_browser);
- LoadAndLaunchExtension(
- "app1", extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW);
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW);
// No new browser should get detected, even though one more is running.
EXPECT_EQ(0u, NumberOfDetectedLauncherBrowsers(false));
EXPECT_EQ(++running_browser, chrome::GetTotalBrowserCount());
- LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB, NEW_WINDOW);
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
+ WindowOpenDisposition::NEW_WINDOW);
// A new browser should get detected and one more should be running.
EXPECT_EQ(NumberOfDetectedLauncherBrowsers(false), 1u);
@@ -1314,21 +1299,23 @@
// Checks the functionality to enumerate all browsers vs. all tabs.
IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestNoDefaultBrowser,
- EnumerateALlBrowsersAndTabs) {
+ EnumerateAllBrowsersAndTabs) {
// Create at least one browser.
- LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB, NEW_WINDOW);
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
+ WindowOpenDisposition::NEW_WINDOW);
size_t browsers = NumberOfDetectedLauncherBrowsers(false);
size_t tabs = NumberOfDetectedLauncherBrowsers(true);
// Create a second browser.
- LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB, NEW_WINDOW);
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
+ WindowOpenDisposition::NEW_WINDOW);
EXPECT_EQ(++browsers, NumberOfDetectedLauncherBrowsers(false));
EXPECT_EQ(++tabs, NumberOfDetectedLauncherBrowsers(true));
// Create only a tab.
LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
- NEW_FOREGROUND_TAB);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB);
EXPECT_EQ(browsers, NumberOfDetectedLauncherBrowsers(false));
EXPECT_EQ(++tabs, NumberOfDetectedLauncherBrowsers(true));
@@ -1348,18 +1335,15 @@
// Create an application handled browser tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* content1 = tab_strip->GetActiveWebContents();
// Create some other browser tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("http://www.test.com"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("http://www.test.com"),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* content1a = tab_strip->GetActiveWebContents();
@@ -1375,9 +1359,7 @@
EXPECT_EQ(content1, tab_strip->GetActiveWebContents());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(url), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* content2 = tab_strip->GetActiveWebContents();
@@ -1676,7 +1658,8 @@
EXPECT_EQ(window1, ash::wm::GetActiveWindow());
// Create anther app and make sure that none of our browsers is active.
- LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB, NEW_WINDOW);
+ LoadAndLaunchExtension("app1", extensions::LAUNCH_CONTAINER_TAB,
+ WindowOpenDisposition::NEW_WINDOW);
EXPECT_NE(window1, ash::wm::GetActiveWindow());
EXPECT_NE(window2, ash::wm::GetActiveWindow());
@@ -1701,9 +1684,7 @@
shortcut_id, GURL("http://www.example.com/path/*"));
std::string url = "http://www.example.com/path/bla";
ui_test_utils::NavigateToURLWithDisposition(
- browser2,
- GURL(url),
- NEW_FOREGROUND_TAB,
+ browser2, GURL(url), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Remember the number of tabs for each browser.
@@ -2217,7 +2198,7 @@
// Create a windowed application.
AppLaunchParams params = CreateAppLaunchParamsUserContainer(
profile(), GetExtensionForAppID(extensions::kWebStoreAppId, profile()),
- NEW_FOREGROUND_TAB, extensions::SOURCE_TEST);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST);
params.container = extensions::LAUNCH_CONTAINER_WINDOW;
OpenApplication(params);
EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
@@ -2302,7 +2283,7 @@
browser(), extensions::AppLaunchInfo::GetLaunchWebURL(hosted_app));
ui_test_utils::NavigateToURLWithDisposition(
browser(), extensions::AppLaunchInfo::GetLaunchWebURL(bookmark_app),
- NEW_FOREGROUND_TAB, 0);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
// The apps should now be running, with the last opened app active.
EXPECT_EQ(ash::STATUS_RUNNING, model_->ItemByID(hosted_app_shelf_id)->status);
@@ -2353,7 +2334,7 @@
browser(), extensions::AppLaunchInfo::GetLaunchWebURL(hosted_app));
ui_test_utils::NavigateToURLWithDisposition(
browser(), extensions::AppLaunchInfo::GetLaunchWebURL(bookmark_app),
- NEW_FOREGROUND_TAB, 0);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
// The apps should still be closed.
EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(hosted_app_shelf_id)->status);
diff --git a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
index db270d7..1092a281 100644
--- a/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
+++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl.cc
@@ -225,9 +225,9 @@
}
void SaveCardBubbleControllerImpl::OpenUrl(const GURL& url) {
- web_contents()->OpenURL(
- content::OpenURLParams(url, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ web_contents()->OpenURL(content::OpenURLParams(
+ url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
} // namespace autofill
diff --git a/chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc b/chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc
index 1e8b2b34..b47c524a 100644
--- a/chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc
+++ b/chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc
@@ -122,8 +122,8 @@
void BluetoothChooserController::OpenHelpCenterUrl() const {
GetBrowser()->OpenURL(content::OpenURLParams(
GURL(chrome::kChooserBluetoothOverviewURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false /* is_renderer_initialized */));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initialized */));
}
void BluetoothChooserController::OnAdapterPresenceChanged(
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
index b9d163a..49242ccc 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
@@ -145,15 +145,15 @@
case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW: {
WindowOpenDisposition initial_disposition;
if (id == IDC_BOOKMARK_BAR_OPEN_ALL) {
- initial_disposition = NEW_BACKGROUND_TAB;
+ initial_disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
content::RecordAction(
UserMetricsAction("BookmarkBar_ContextMenu_OpenAll"));
} else if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW) {
- initial_disposition = NEW_WINDOW;
+ initial_disposition = WindowOpenDisposition::NEW_WINDOW;
content::RecordAction(
UserMetricsAction("BookmarkBar_ContextMenu_OpenAllInNewWindow"));
} else {
- initial_disposition = OFF_THE_RECORD;
+ initial_disposition = WindowOpenDisposition::OFF_THE_RECORD;
content::RecordAction(
UserMetricsAction("BookmarkBar_ContextMenu_OpenAllIncognito"));
}
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
index 2143adce9..c9f9b79 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -112,7 +112,8 @@
// Tests open all on a folder with a couple of bookmarks.
TEST_F(BookmarkContextMenuControllerTest, OpenAll) {
const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
- chrome::OpenAll(NULL, &navigator_, folder, NEW_FOREGROUND_TAB, NULL);
+ chrome::OpenAll(NULL, &navigator_, folder,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, NULL);
// Should have navigated to F1's child, but not F11's child.
ASSERT_EQ(static_cast<size_t>(1), navigator_.urls_.size());
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
index 62fc536c..b5d7dbb1 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
@@ -196,7 +196,7 @@
// When |initial_disposition| is OFF_THE_RECORD, a node which can't be
// opened in incognito window, it is detected using |browser_context|, is
// not opened.
- if (initial_disposition == OFF_THE_RECORD &&
+ if (initial_disposition == WindowOpenDisposition::OFF_THE_RECORD &&
!IsURLAllowedInIncognito(*url, browser_context))
continue;
@@ -206,7 +206,7 @@
if (!opened_first_url) {
opened_first_url = true;
- disposition = NEW_BACKGROUND_TAB;
+ disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
// We opened the first URL which may have opened a new window or clobbered
// the current page, reset the navigator just to be sure. |opened_tab| may
// be NULL in tests.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index e9bc27e..1483086b 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1013,7 +1013,7 @@
// TODO(georgesak): Validate the usefulness of this. And if needed then move
// to TabManager.
if (g_browser_process->GetTabManager()->IsTabDiscarded(new_contents))
- chrome::Reload(this, CURRENT_TAB);
+ chrome::Reload(this, WindowOpenDisposition::CURRENT_TAB);
// If we have any update pending, do it now.
if (chrome_updater_factory_.HasWeakPtrs() && old_contents)
@@ -1368,10 +1368,10 @@
popup_blocker_helper = PopupBlockerTabHelper::FromWebContents(source);
if (popup_blocker_helper) {
- if ((params.disposition == NEW_POPUP ||
- params.disposition == NEW_FOREGROUND_TAB ||
- params.disposition == NEW_BACKGROUND_TAB ||
- params.disposition == NEW_WINDOW) &&
+ if ((params.disposition == WindowOpenDisposition::NEW_POPUP ||
+ params.disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ params.disposition == WindowOpenDisposition::NEW_WINDOW) &&
!params.user_gesture &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisablePopupBlocking)) {
@@ -1942,8 +1942,8 @@
if (url.is_empty())
return;
- OpenURL(OpenURLParams(
- url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ OpenURL(OpenURLParams(url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index ad3ebe0..e9f356e 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -520,7 +520,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(
&web_contents->GetController()));
- browser()->OpenURL(OpenURLParams(abort_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(abort_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
stop_observer.Wait();
EXPECT_TRUE(web_contents->GetController().GetPendingEntry());
@@ -538,7 +539,8 @@
content::NOTIFICATION_LOAD_STOP,
content::Source<NavigationController>(
&web_contents->GetController()));
- browser()->OpenURL(OpenURLParams(abort_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(abort_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
stop_observer.Wait();
EXPECT_FALSE(web_contents->GetController().GetPendingEntry());
@@ -667,7 +669,7 @@
// Navigate to another page, but click cancel in the dialog. Make sure that
// the throbber stops spinning.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
alert->CloseModalDialog();
EXPECT_FALSE(
@@ -788,7 +790,8 @@
GURL https_url(https_test_server.GetURL("/title1.html"));
GURL redirect_url(
embedded_test_server()->GetURL("/server-redirect?" + https_url.spec()));
- browser()->OpenURL(OpenURLParams(redirect_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(redirect_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(
@@ -810,8 +813,9 @@
// Navigate to a page that triggers a cross-site transition.
ASSERT_TRUE(embedded_test_server()->Start());
GURL url2(embedded_test_server()->GetURL("/title1.html"));
- browser()->OpenURL(OpenURLParams(
- url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(OpenURLParams(url2, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
content::WindowedNotificationObserver host_destroyed_observer(
content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
@@ -884,7 +888,7 @@
ui_test_utils::NavigateToURL(browser(), url);
// Reload the page, and check that we get a "before reload" dialog.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_TRUE(static_cast<JavaScriptAppModalDialog*>(alert)->is_reload());
@@ -893,8 +897,9 @@
// Navigate to another url, and check that we get a "before unload" dialog.
GURL url2(url::kAboutBlankURL);
- browser()->OpenURL(OpenURLParams(
- url2, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ browser()->OpenURL(OpenURLParams(url2, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
alert = ui_test_utils::WaitForAppModalDialog();
EXPECT_FALSE(static_cast<JavaScriptAppModalDialog*>(alert)->is_reload());
@@ -1426,7 +1431,7 @@
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
WebContents* app_window = OpenApplication(AppLaunchParams(
browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_TEST));
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(app_window);
DevToolsWindow* devtools_window =
@@ -1546,7 +1551,7 @@
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
WebContents* app_window = OpenApplication(AppLaunchParams(
browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_TEST));
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
ASSERT_TRUE(app_window);
// Apps launched in a window from the NTP have an extensions tab helper but
@@ -1622,7 +1627,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
back_nav_load_observer.Wait();
CommandUpdater* command_updater =
browser()->command_controller()->command_updater();
@@ -1633,7 +1638,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::GoForward(browser(), CURRENT_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB);
// This check will happen before the navigation completes, since the browser
// won't process the renderer's response until the Wait() call below.
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_FORWARD));
@@ -1986,7 +1991,7 @@
EXPECT_TRUE(mock_observer.got_user_gesture());
mock_observer.set_got_user_gesture(false);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_TRUE(mock_observer.got_user_gesture());
}
@@ -2371,7 +2376,7 @@
browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(url, web_contents->GetURL());
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
content::WebContents* web_contents =
browser->tab_strip_model()->GetActiveWebContents();
content::TestNavigationObserver same_tab_observer(web_contents);
@@ -2389,7 +2394,7 @@
SimulateMouseClick(web_contents, modifiers, button);
observer.Wait();
- if (disposition == NEW_WINDOW) {
+ if (disposition == WindowOpenDisposition::NEW_WINDOW) {
EXPECT_EQ(2u, chrome::GetBrowserCount(browser->profile()));
return;
}
@@ -2398,10 +2403,10 @@
EXPECT_EQ(2, browser->tab_strip_model()->count());
web_contents = browser->tab_strip_model()->GetActiveWebContents();
WaitForLoadStop(web_contents);
- if (disposition == NEW_FOREGROUND_TAB) {
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
EXPECT_EQ(getSecondPageTitle(), web_contents->GetTitle());
} else {
- ASSERT_EQ(NEW_BACKGROUND_TAB, disposition);
+ ASSERT_EQ(WindowOpenDisposition::NEW_BACKGROUND_TAB, disposition);
EXPECT_EQ(getFirstPageTitle(), web_contents->GetTitle());
}
}
@@ -2415,7 +2420,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenBasicClickTest) {
int modifiers = 0;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
}
@@ -2426,7 +2431,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, WindowOpenShiftClickTest) {
int modifiers = blink::WebInputEvent::ShiftKey;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_WINDOW;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_WINDOW;
RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
}
@@ -2439,7 +2444,7 @@
int modifiers = blink::WebInputEvent::ControlKey;
#endif
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
}
@@ -2453,7 +2458,7 @@
#endif
modifiers |= blink::WebInputEvent::ShiftKey;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
RunTest(browser(), GetWindowOpenURL(), modifiers, button, disposition);
}
@@ -2462,7 +2467,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefBasicClickTest) {
int modifiers = 0;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = CURRENT_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::CURRENT_TAB;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
@@ -2473,7 +2478,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftClickTest) {
int modifiers = blink::WebInputEvent::ShiftKey;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_WINDOW;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_WINDOW;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
@@ -2486,7 +2491,7 @@
int modifiers = blink::WebInputEvent::ControlKey;
#endif
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
@@ -2501,7 +2506,7 @@
#endif
modifiers |= blink::WebInputEvent::ShiftKey;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Left;
- WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
@@ -2509,7 +2514,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefMiddleClickTest) {
int modifiers = 0;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
- WindowOpenDisposition disposition = NEW_BACKGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
@@ -2518,7 +2523,7 @@
IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) {
int modifiers = blink::WebInputEvent::ShiftKey;
blink::WebMouseEvent::Button button = blink::WebMouseEvent::Button::Middle;
- WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
}
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index ef5a797..baafa1b 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -106,7 +106,7 @@
command_updater_(this),
block_command_execution_(false),
last_blocked_command_id_(-1),
- last_blocked_command_disposition_(CURRENT_TAB) {
+ last_blocked_command_disposition_(WindowOpenDisposition::CURRENT_TAB) {
browser_->tab_strip_model()->AddObserver(this);
PrefService* local_state = g_browser_process->local_state();
if (local_state) {
@@ -222,7 +222,7 @@
block_command_execution_ = block;
if (block) {
last_blocked_command_id_ = -1;
- last_blocked_command_disposition_ = CURRENT_TAB;
+ last_blocked_command_disposition_ = WindowOpenDisposition::CURRENT_TAB;
}
}
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index b67422e8..fefd9004 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -186,18 +186,19 @@
WindowOpenDisposition disposition) {
WebContents* current_tab = browser->tab_strip_model()->GetActiveWebContents();
switch (disposition) {
- case NEW_FOREGROUND_TAB:
- case NEW_BACKGROUND_TAB: {
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::NEW_BACKGROUND_TAB: {
WebContents* new_tab = current_tab->Clone();
- if (disposition == NEW_BACKGROUND_TAB)
+ if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)
new_tab->WasHidden();
browser->tab_strip_model()->AddWebContents(
new_tab, -1, ui::PAGE_TRANSITION_LINK,
- (disposition == NEW_FOREGROUND_TAB) ?
- TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE);
+ (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
+ ? TabStripModel::ADD_ACTIVE
+ : TabStripModel::ADD_NONE);
return new_tab;
}
- case NEW_WINDOW: {
+ case WindowOpenDisposition::NEW_WINDOW: {
WebContents* new_tab = current_tab->Clone();
Browser* new_browser =
new Browser(Browser::CreateParams(browser->profile()));
@@ -469,7 +470,8 @@
url = extensions::AppLaunchInfo::GetLaunchWebURL(extension);
}
- if (disposition == CURRENT_TAB || disposition == NEW_FOREGROUND_TAB)
+ if (disposition == WindowOpenDisposition::CURRENT_TAB ||
+ disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
extensions::MaybeShowExtensionControlledHomeNotification(browser);
#endif
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index fd03279..e7e0449 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -599,7 +599,7 @@
content::Source<content::NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
// Focus should stay on the location bar.
@@ -616,7 +616,7 @@
content::Source<content::NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
@@ -639,7 +639,7 @@
content::Source<content::NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
@@ -669,7 +669,7 @@
// Navigate to url.
chrome::NavigateParams p(browser(), url, ui::PAGE_TRANSITION_LINK);
p.window_action = chrome::NavigateParams::SHOW_WINDOW;
- p.disposition = CURRENT_TAB;
+ p.disposition = WindowOpenDisposition::CURRENT_TAB;
chrome::Navigate(&p);
// Focus the omnibox.
@@ -679,9 +679,9 @@
GetOmniboxView()->model()->controller();
// Simulate an alt-enter.
- controller->OnAutocompleteAccept(url2, NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED,
- AutocompleteMatchType::URL_WHAT_YOU_TYPED);
+ controller->OnAutocompleteAccept(
+ url2, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, AutocompleteMatchType::URL_WHAT_YOU_TYPED);
// Make sure the second tab is selected.
EXPECT_EQ(1, browser()->tab_strip_model()->active_index());
@@ -724,7 +724,7 @@
content::WindowedNotificationObserver back_nav_observer(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
back_nav_observer.Wait();
}
@@ -736,7 +736,7 @@
content::WindowedNotificationObserver forward_nav_observer(
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
- chrome::GoForward(browser(), CURRENT_TAB);
+ chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB);
forward_nav_observer.Wait();
}
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 08b8d6f..442ba27 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -106,14 +106,16 @@
bool BrowserInstantController::OpenInstant(WindowOpenDisposition disposition,
const GURL& url) {
// Unsupported dispositions.
- if (disposition == NEW_BACKGROUND_TAB || disposition == NEW_WINDOW ||
- disposition == NEW_FOREGROUND_TAB)
+ if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_WINDOW ||
+ disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
return false;
// The omnibox currently doesn't use other dispositions, so we don't attempt
// to handle them. If you hit this DCHECK file a bug and I'll (sky) add
// support for the new disposition.
- DCHECK(disposition == CURRENT_TAB) << disposition;
+ DCHECK(disposition == WindowOpenDisposition::CURRENT_TAB)
+ << static_cast<int>(disposition);
const base::string16& search_terms =
search::ExtractSearchTermsFromURL(profile(), url);
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 1f60c7a..816f1d77 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -102,7 +102,8 @@
Profile* profile = params->initiating_profile;
- if (profile->IsOffTheRecord() || params->disposition == OFF_THE_RECORD) {
+ if (profile->IsOffTheRecord() ||
+ params->disposition == WindowOpenDisposition::OFF_THE_RECORD) {
profile = profile->GetOriginalProfile();
// If incognito is forced, we punt.
@@ -112,7 +113,7 @@
return false;
}
- params->disposition = SINGLETON_TAB;
+ params->disposition = WindowOpenDisposition::SINGLETON_TAB;
params->browser = GetOrCreateBrowser(profile);
params->window_action = chrome::NavigateParams::SHOW_WINDOW;
}
@@ -136,22 +137,22 @@
Profile* profile = params->initiating_profile;
switch (params->disposition) {
- case CURRENT_TAB:
+ case WindowOpenDisposition::CURRENT_TAB:
if (params->browser)
return params->browser;
// Find a compatible window and re-execute this command in it. Otherwise
// re-run with NEW_WINDOW.
return GetOrCreateBrowser(profile);
- case SINGLETON_TAB:
- case NEW_FOREGROUND_TAB:
- case NEW_BACKGROUND_TAB:
+ case WindowOpenDisposition::SINGLETON_TAB:
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::NEW_BACKGROUND_TAB:
// See if we can open the tab in the window this navigator is bound to.
if (params->browser && WindowCanOpenTabs(params->browser))
return params->browser;
// Find a compatible window and re-execute this command in it. Otherwise
// re-run with NEW_WINDOW.
return GetOrCreateBrowser(profile);
- case NEW_POPUP: {
+ case WindowOpenDisposition::NEW_POPUP: {
// Make a new popup window.
// Coerce app-style if |source| represents an app.
std::string app_name;
@@ -180,16 +181,16 @@
return new Browser(Browser::CreateParams::CreateForApp(
app_name, params->trusted_source, params->window_bounds, profile));
}
- case NEW_WINDOW: {
+ case WindowOpenDisposition::NEW_WINDOW: {
// Make a new normal browser window.
return new Browser(Browser::CreateParams(profile));
}
- case OFF_THE_RECORD:
+ case WindowOpenDisposition::OFF_THE_RECORD:
// Make or find an incognito window.
return GetOrCreateBrowser(profile->GetOffTheRecordProfile());
// The following types result in no navigation.
- case SAVE_TO_DISK:
- case IGNORE_ACTION:
+ case WindowOpenDisposition::SAVE_TO_DISK:
+ case WindowOpenDisposition::IGNORE_ACTION:
return NULL;
default:
NOTREACHED();
@@ -202,35 +203,37 @@
void NormalizeDisposition(chrome::NavigateParams* params) {
// Calculate the WindowOpenDisposition if necessary.
if (params->browser->tab_strip_model()->empty() &&
- (params->disposition == NEW_BACKGROUND_TAB ||
- params->disposition == CURRENT_TAB ||
- params->disposition == SINGLETON_TAB)) {
- params->disposition = NEW_FOREGROUND_TAB;
+ (params->disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ params->disposition == WindowOpenDisposition::CURRENT_TAB ||
+ params->disposition == WindowOpenDisposition::SINGLETON_TAB)) {
+ params->disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
}
if (params->browser->profile()->IsOffTheRecord() &&
- params->disposition == OFF_THE_RECORD) {
- params->disposition = NEW_FOREGROUND_TAB;
+ params->disposition == WindowOpenDisposition::OFF_THE_RECORD) {
+ params->disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
}
- if (!params->source_contents && params->disposition == CURRENT_TAB)
- params->disposition = NEW_FOREGROUND_TAB;
+ if (!params->source_contents &&
+ params->disposition == WindowOpenDisposition::CURRENT_TAB)
+ params->disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
switch (params->disposition) {
- case NEW_BACKGROUND_TAB:
+ case WindowOpenDisposition::NEW_BACKGROUND_TAB:
// Disposition trumps add types. ADD_ACTIVE is a default, so we need to
// remove it if disposition implies the tab is going to open in the
// background.
params->tabstrip_add_types &= ~TabStripModel::ADD_ACTIVE;
break;
- case NEW_WINDOW:
- case NEW_POPUP:
+ case WindowOpenDisposition::NEW_WINDOW:
+ case WindowOpenDisposition::NEW_POPUP: {
// Code that wants to open a new window typically expects it to be shown
// automatically.
if (params->window_action == chrome::NavigateParams::NO_ACTION)
params->window_action = chrome::NavigateParams::SHOW_WINDOW;
// Fall-through.
- case NEW_FOREGROUND_TAB:
- case SINGLETON_TAB:
+ }
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::SINGLETON_TAB:
params->tabstrip_add_types |= TabStripModel::ADD_ACTIVE;
break;
@@ -286,7 +289,8 @@
} else if (params_->window_action == chrome::NavigateParams::SHOW_WINDOW) {
params_->browser->window()->Show();
// If a user gesture opened a popup window, focus the contents.
- if (params_->user_gesture && params_->disposition == NEW_POPUP &&
+ if (params_->user_gesture &&
+ params_->disposition == WindowOpenDisposition::NEW_POPUP &&
params_->target_contents) {
params_->target_contents->Focus();
}
@@ -345,7 +349,7 @@
params.source_contents->GetContainerBounds().size();
create_params.created_with_opener = params.created_with_opener;
}
- if (params.disposition == NEW_BACKGROUND_TAB)
+ if (params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)
create_params.initially_hidden = true;
#if defined(USE_AURA)
@@ -410,9 +414,8 @@
#endif
// The browser window may want to adjust the disposition.
- if (params->disposition == NEW_POPUP &&
- source_browser &&
- source_browser->window()) {
+ if (params->disposition == WindowOpenDisposition::NEW_POPUP &&
+ source_browser && source_browser->window()) {
params->disposition =
source_browser->window()->GetDispositionForPopupBounds(
params->window_bounds);
@@ -473,7 +476,7 @@
// If we create a popup window from a non user-gesture, don't activate it.
if (params->window_action == NavigateParams::SHOW_WINDOW &&
- params->disposition == NEW_POPUP &&
+ params->disposition == WindowOpenDisposition::NEW_POPUP &&
params->user_gesture == false) {
params->window_action = NavigateParams::SHOW_WINDOW_INACTIVE;
}
@@ -506,7 +509,7 @@
// exists.
if (!params->target_contents && singleton_index < 0) {
DCHECK(!params->url.is_empty());
- if (params->disposition != CURRENT_TAB) {
+ if (params->disposition != WindowOpenDisposition::CURRENT_TAB) {
params->target_contents = CreateTargetContents(*params, params->url);
// This function takes ownership of |params->target_contents| until it
@@ -546,13 +549,14 @@
// lose focus, then make sure the focus for the source tab goes away from the
// omnibox.
if (params->source_contents &&
- (params->disposition == NEW_FOREGROUND_TAB ||
- params->disposition == NEW_WINDOW) &&
+ (params->disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ params->disposition == WindowOpenDisposition::NEW_WINDOW) &&
(params->tabstrip_add_types & TabStripModel::ADD_INHERIT_OPENER))
params->source_contents->Focus();
if (params->source_contents == params->target_contents ||
- (swapped_in_prerender && params->disposition == CURRENT_TAB)) {
+ (swapped_in_prerender &&
+ params->disposition == WindowOpenDisposition::CURRENT_TAB)) {
// The navigation occurred in the source tab.
params->browser->UpdateUIForNavigationInTab(
params->target_contents, params->transition, params->window_action,
@@ -592,7 +596,7 @@
}
}
- if (params->disposition != CURRENT_TAB) {
+ if (params->disposition != WindowOpenDisposition::CURRENT_TAB) {
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_TAB_ADDED,
content::Source<content::WebContentsDelegate>(params->browser),
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index efae8f1..dad1b0a 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -92,7 +92,7 @@
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 @@
// 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(¶ms);
@@ -191,7 +191,7 @@
// 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(¶ms);
@@ -262,7 +262,7 @@
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url1;
chrome::Navigate(¶ms);
@@ -291,7 +291,7 @@
// Navigate to singleton_url2.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_ref_url2;
chrome::Navigate(¶ms);
@@ -302,7 +302,7 @@
// 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(¶ms);
@@ -314,7 +314,7 @@
// 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(¶ms);
@@ -335,7 +335,7 @@
// Navigate to singleton_url1.
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = singleton_url1;
chrome::Navigate(¶ms);
@@ -352,7 +352,7 @@
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(¶ms);
EXPECT_NE(old_contents,
browser()->tab_strip_model()->GetActiveWebContents());
@@ -367,7 +367,7 @@
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(¶ms);
WebContents* new_contents =
browser()->tab_strip_model()->GetActiveWebContents();
@@ -387,7 +387,7 @@
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(¶ms);
// Navigate() should have opened the tab in a different browser since the
@@ -420,7 +420,7 @@
Browser::TYPE_POPUP,
browser()->profile()->GetOffTheRecordProfile());
chrome::NavigateParams params(MakeNavigateParams(popup));
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
// Navigate() should have opened the tab in a different browser since the
@@ -446,7 +446,7 @@
// 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(¶ms);
@@ -471,7 +471,7 @@
// 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_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(¶ms1);
// 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(¶ms2);
@@ -522,7 +522,7 @@
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(¶ms);
@@ -547,12 +547,12 @@
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(¶ms1);
// 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(¶ms2);
@@ -582,7 +582,7 @@
// 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 @@
// 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 @@
// 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(¶ms);
// Navigate() should have opened a new toplevel window.
@@ -637,7 +637,7 @@
// 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(¶ms);
// Navigate() should have opened a new toplevel incognito window.
@@ -663,7 +663,7 @@
CreateEmptyBrowserForType(Browser::TYPE_TABBED,
browser()->profile()->GetOffTheRecordProfile());
chrome::NavigateParams params(MakeNavigateParams());
- params.disposition = OFF_THE_RECORD;
+ params.disposition = WindowOpenDisposition::OFF_THE_RECORD;
chrome::Navigate(¶ms);
// Navigate() should have opened a new tab in the existing incognito window.
@@ -680,19 +680,19 @@
// 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(¶ms);
@@ -711,7 +711,7 @@
// 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(¶ms);
@@ -751,7 +751,7 @@
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 @@
// 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(¶ms);
@@ -823,7 +823,7 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
// 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 @@
"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 @@
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 @@
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 @@
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 @@
// 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(¶ms);
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index e125acb..3b8bc4b 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -50,7 +50,7 @@
// Navigate to the settings page.
chrome::NavigateParams params(MakeNavigateParams(incognito_browser));
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.url = GURL("chrome://chrome/settings");
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -83,7 +83,7 @@
// Navigate to the settings page.
chrome::NavigateParams params(MakeNavigateParams(browser()));
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.url = GURL("chrome://chrome/settings");
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
@@ -107,7 +107,7 @@
// Navigate to the settings page.
chrome::NavigateParams params(MakeNavigateParams(browser()));
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.url = GURL("chrome://chrome/settings");
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
diff --git a/chrome/browser/ui/browser_navigator_params.cc b/chrome/browser/ui/browser_navigator_params.cc
index d60cc75e..40ddeaa 100644
--- a/chrome/browser/ui/browser_navigator_params.cc
+++ b/chrome/browser/ui/browser_navigator_params.cc
@@ -25,7 +25,7 @@
uses_post(false),
target_contents(a_target_contents),
source_contents(nullptr),
- disposition(CURRENT_TAB),
+ disposition(WindowOpenDisposition::CURRENT_TAB),
trusted_source(false),
transition(ui::PAGE_TRANSITION_LINK),
is_renderer_initiated(false),
@@ -37,8 +37,7 @@
ref_behavior(IGNORE_REF),
initiating_profile(nullptr),
should_replace_current_entry(false),
- created_with_opener(false) {
-}
+ created_with_opener(false) {}
#else
NavigateParams::NavigateParams(Browser* a_browser,
const GURL& a_url,
@@ -48,7 +47,7 @@
uses_post(false),
target_contents(NULL),
source_contents(NULL),
- disposition(CURRENT_TAB),
+ disposition(WindowOpenDisposition::CURRENT_TAB),
trusted_source(false),
transition(a_transition),
is_renderer_initiated(false),
@@ -61,8 +60,7 @@
browser(a_browser),
initiating_profile(NULL),
should_replace_current_entry(false),
- created_with_opener(false) {
-}
+ created_with_opener(false) {}
NavigateParams::NavigateParams(Browser* a_browser,
WebContents* a_target_contents)
@@ -70,7 +68,7 @@
uses_post(false),
target_contents(a_target_contents),
source_contents(NULL),
- disposition(CURRENT_TAB),
+ disposition(WindowOpenDisposition::CURRENT_TAB),
trusted_source(false),
transition(ui::PAGE_TRANSITION_LINK),
is_renderer_initiated(false),
@@ -83,8 +81,7 @@
browser(a_browser),
initiating_profile(NULL),
should_replace_current_entry(false),
- created_with_opener(false) {
-}
+ created_with_opener(false) {}
#endif // !defined(OS_ANDROID)
NavigateParams::NavigateParams(Profile* a_profile,
@@ -95,7 +92,7 @@
uses_post(false),
target_contents(NULL),
source_contents(NULL),
- disposition(NEW_FOREGROUND_TAB),
+ disposition(WindowOpenDisposition::NEW_FOREGROUND_TAB),
trusted_source(false),
transition(a_transition),
is_renderer_initiated(false),
diff --git a/chrome/browser/ui/browser_tabrestore_browsertest.cc b/chrome/browser/ui/browser_tabrestore_browsertest.cc
index 90af588..5fd6ac3 100644
--- a/chrome/browser/ui/browser_tabrestore_browsertest.cc
+++ b/chrome/browser/ui/browser_tabrestore_browsertest.cc
@@ -47,10 +47,10 @@
GURL test_page(ui_test_utils::GetTestUrl(base::FilePath(),
base::FilePath(FILE_PATH_LITERAL("tab-restore-visibility.html"))));
ui_test_utils::NavigateToURLWithDisposition(
- browser, test_page, NEW_FOREGROUND_TAB,
+ browser, test_page, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
- browser, test_page, NEW_BACKGROUND_TAB,
+ browser, test_page, WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
}
@@ -69,9 +69,7 @@
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_WINDOW,
+ browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
BrowserList* active_browser_list = BrowserList::GetInstance();
EXPECT_EQ(2u, active_browser_list->size());
@@ -104,9 +102,7 @@
// Create a new browser.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url::kAboutBlankURL),
- NEW_WINDOW,
+ browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
BrowserList* active_browser_list = BrowserList::GetInstance();
EXPECT_EQ(2u, active_browser_list->size());
diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc
index 995e0de..f75af14 100644
--- a/chrome/browser/ui/browser_tabstrip.cc
+++ b/chrome/browser/ui/browser_tabstrip.cc
@@ -27,7 +27,8 @@
chrome::NavigateParams params(browser,
url.is_empty() ? GURL(chrome::kChromeUINewTabURL) : url,
ui::PAGE_TRANSITION_TYPED);
- params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+ params.disposition = foreground ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.tabstrip_index = idx;
chrome::Navigate(¶ms);
CoreTabHelper* core_tab_helper =
@@ -40,7 +41,7 @@
const GURL& url,
ui::PageTransition transition) {
NavigateParams params(browser, url, transition);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
Navigate(¶ms);
return params.target_contents;
}
@@ -53,9 +54,9 @@
bool user_gesture,
bool* was_blocked) {
// No code for this yet.
- DCHECK(disposition != SAVE_TO_DISK);
+ DCHECK(disposition != WindowOpenDisposition::SAVE_TO_DISK);
// Can't create a new contents for the current tab - invalid case.
- DCHECK(disposition != CURRENT_TAB);
+ DCHECK(disposition != WindowOpenDisposition::CURRENT_TAB);
NavigateParams params(browser, new_contents);
params.source_contents = source_contents;
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index cb5d5c5..0d4739e 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -104,11 +104,11 @@
default:
NOTREACHED() << "Unhandled help source" << source;
}
- OpenApplication(
- AppLaunchParams(profile, extension,
- extensions::GetLaunchContainer(
- extensions::ExtensionPrefs::Get(profile), extension),
- NEW_FOREGROUND_TAB, app_launch_source, true));
+ OpenApplication(AppLaunchParams(
+ profile, extension,
+ extensions::GetLaunchContainer(extensions::ExtensionPrefs::Get(profile),
+ extension),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, app_launch_source, true));
#else
GURL url;
switch (source) {
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
index b43b88b..4552193 100644
--- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
@@ -146,11 +146,8 @@
const GURL& previousURL = entry->GetVirtualURL();
webContents_->OpenURL(OpenURLParams(
- url,
- content::Referrer(previousURL, blink::WebReferrerPolicyDefault),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ url, content::Referrer(previousURL, blink::WebReferrerPolicyDefault),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
}
- (NSString*)title {
@@ -284,10 +281,8 @@
webContents_->OpenURL(
OpenURLParams(GURL(content::kViewSourceScheme + std::string(":") +
entry->GetURL().spec()),
- Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
}
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
index 66fd7c5..e77835b 100644
--- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -200,7 +200,7 @@
base::TimeTicks newTabStartTime = base::TimeTicks::Now();
chrome::NavigateParams params(browser_, GURL(chrome::kChromeUINewTabURL),
ui::PAGE_TRANSITION_TYPED);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
params.tabstrip_index = index;
chrome::Navigate(¶ms);
CoreTabHelper* core_tab_helper =
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
index 6c49dca..87552244 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm
@@ -66,9 +66,9 @@
content::WindowedNotificationObserver app_loaded_observer(
content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
content::NotificationService::AllSources());
- OpenApplication(
- AppLaunchParams(profile(), app_, extensions::LAUNCH_CONTAINER_NONE,
- NEW_WINDOW, extensions::SOURCE_TEST));
+ OpenApplication(AppLaunchParams(
+ profile(), app_, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST));
app_loaded_observer.Wait();
}
}
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index fb15b7d8..1a798307 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -747,7 +747,7 @@
[bar_ openBookmark:button];
EXPECT_EQ(noOpenBar()->urls_[0], node->url());
- EXPECT_EQ(noOpenBar()->dispositions_[0], CURRENT_TAB);
+ EXPECT_EQ(noOpenBar()->dispositions_[0], WindowOpenDisposition::CURRENT_TAB);
}
TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
@@ -1793,8 +1793,9 @@
[first performClick:first];
size_t dispositionCount = noOpenBar()->dispositions_.size();
- EXPECT_EQ(originalDispositionCount+1, dispositionCount);
- EXPECT_EQ(noOpenBar()->dispositions_[dispositionCount-1], NEW_BACKGROUND_TAB);
+ EXPECT_EQ(originalDispositionCount + 1, dispositionCount);
+ EXPECT_EQ(noOpenBar()->dispositions_[dispositionCount - 1],
+ WindowOpenDisposition::NEW_BACKGROUND_TAB);
// Replace NSApp
NSApp = oldApp;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm
index 147a798..fd8c94f 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.mm
@@ -65,10 +65,9 @@
NSEvent* event = [NSApp currentEvent];
WindowOpenDisposition disposition =
ui::WindowOpenDispositionFromNSEvent(event);
- if (([event type] != NSMouseEntered) &&
- ([event type] != NSMouseMoved) &&
+ if (([event type] != NSMouseEntered) && ([event type] != NSMouseMoved) &&
([event type] != NSScrollWheel) &&
- (disposition == NEW_BACKGROUND_TAB)) {
+ (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)) {
[controller_ closeAllBookmarkFolders];
[controller_ openAll:[sender bookmarkNode] disposition:disposition];
return;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
index 169beadc..88b94229 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
@@ -122,9 +122,9 @@
chrome::OpenAll(NULL, browser, node, disposition, browser->profile());
- if (disposition == NEW_FOREGROUND_TAB) {
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
content::RecordAction(UserMetricsAction("OpenAllBookmarks"));
- } else if (disposition == NEW_WINDOW) {
+ } else if (disposition == WindowOpenDisposition::NEW_WINDOW) {
content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow"));
} else {
content::RecordAction(
@@ -144,15 +144,18 @@
}
- (IBAction)openAllBookmarks:(id)sender {
- [self openAll:[sender tag] withDisposition:NEW_FOREGROUND_TAB];
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
+ [self openAll:[sender tag] withDisposition:disposition];
}
- (IBAction)openAllBookmarksNewWindow:(id)sender {
- [self openAll:[sender tag] withDisposition:NEW_WINDOW];
+ WindowOpenDisposition disposition = WindowOpenDisposition::NEW_WINDOW;
+ [self openAll:[sender tag] withDisposition:disposition];
}
- (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
- [self openAll:[sender tag] withDisposition:OFF_THE_RECORD];
+ WindowOpenDisposition disposition = WindowOpenDisposition::OFF_THE_RECORD;
+ [self openAll:[sender tag] withDisposition:disposition];
}
@end // BookmarkMenuCocoaController
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
index 3aad9f8..f8266e3c 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
@@ -56,11 +56,11 @@
- (void)openAll:(NSInteger)tag
withDisposition:(WindowOpenDisposition)disposition {
- if (disposition == NEW_FOREGROUND_TAB) {
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
opened_new_foreground_tab = YES;
- } else if (disposition == NEW_WINDOW) {
+ } else if (disposition == WindowOpenDisposition::NEW_WINDOW) {
opened_new_window = YES;
- } else if (disposition == OFF_THE_RECORD) {
+ } else if (disposition == WindowOpenDisposition::OFF_THE_RECORD) {
opened_off_the_record = YES;
}
}
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index 1d2228c..ecbada6 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -752,8 +752,8 @@
const gfx::Rect& bounds) {
// When using Cocoa's System Fullscreen mode, convert popups into tabs.
if ([controller_ isInAppKitFullscreen])
- return NEW_FOREGROUND_TAB;
- return NEW_POPUP;
+ return WindowOpenDisposition::NEW_FOREGROUND_TAB;
+ return WindowOpenDisposition::NEW_POPUP;
}
FindBar* BrowserWindowCocoa::CreateFindBar() {
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index b0d72ada..46e17a9 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -446,7 +446,7 @@
void AddTabAtBackground(int index, GURL url) {
chrome::NavigateParams params(browser(), url, ui::PAGE_TRANSITION_LINK);
params.tabstrip_index = index;
- params.disposition = NEW_BACKGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
chrome::Navigate(¶ms);
content::WaitForLoadStopWithoutSuccessCheck(params.target_contents);
}
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
index 1f9582a..ac2d480 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
@@ -99,7 +99,8 @@
content::WebContents::CreateParams(browser()->profile())));
bool was_blocked = false;
chrome::AddWebContents(browser(), NULL, web_contents.release(),
- NEW_BACKGROUND_TAB, gfx::Rect(), false, &was_blocked);
+ WindowOpenDisposition::NEW_BACKGROUND_TAB, gfx::Rect(),
+ false, &was_blocked);
content::WebContents* tab2 =
browser()->tab_strip_model()->GetWebContentsAt(2);
ASSERT_TRUE(tab2);
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
index 279270e..1d5ca18 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm
@@ -252,8 +252,9 @@
- (IBAction)storeLinkClicked:(id)sender {
GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() +
prompt_->extension()->id());
- OpenURLParams params(store_url, Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ OpenURLParams params(store_url, Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
if (navigator_) {
navigator_->OpenURL(params);
} else {
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
index 6d672cb..0f7c796 100644
--- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
@@ -49,7 +49,8 @@
Browser* browser = chrome::FindTabbedBrowser(bridge_->profile(), false);
BrowserLiveTabContext* context =
browser ? browser->live_tab_context() : NULL;
- service->RestoreEntryById(context, node->session_id, UNKNOWN);
+ service->RestoreEntryById(context, node->session_id,
+ WindowOpenDisposition::UNKNOWN);
} else {
DCHECK(node->url.is_valid());
WindowOpenDisposition disposition =
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
index ad7b278c..ee0a228 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm
@@ -162,7 +162,7 @@
void OmniboxPopupViewMac::OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
size_t row) {
- OpenURLForRow(row, NEW_BACKGROUND_TAB);
+ OpenURLForRow(row, WindowOpenDisposition::NEW_BACKGROUND_TAB);
}
const AutocompleteResult& OmniboxPopupViewMac::GetResult() const {
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 3a0f688..3c202f5e 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -879,7 +879,7 @@
// Option-Return
if (cmd == @selector(insertNewlineIgnoringFieldEditor:)) {
- model()->AcceptInput(NEW_FOREGROUND_TAB, false);
+ model()->AcceptInput(WindowOpenDisposition::NEW_FOREGROUND_TAB, false);
return true;
}
diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
index afba24fc..6ed318a 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
@@ -111,9 +111,9 @@
OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST);
}
else {
- content::OpenURLParams params(GURL(chrome::kChromeUISettingsURL),
- content::Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ content::OpenURLParams params(
+ GURL(chrome::kChromeUISettingsURL), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false);
webContents_->OpenURL(params);
}
[self close];
@@ -288,8 +288,9 @@
signin_metrics::LogSigninConfirmHistogramValue(
signin_metrics::HISTOGRAM_CONFIRM_LEARN_MORE);
}
- WindowOpenDisposition location = isSyncDialog_ ?
- NEW_WINDOW : NEW_FOREGROUND_TAB;
+ WindowOpenDisposition location =
+ isSyncDialog_ ? WindowOpenDisposition::NEW_WINDOW
+ : WindowOpenDisposition::NEW_FOREGROUND_TAB;
content::OpenURLParams params(GURL(chrome::kChromeSyncLearnMoreURL),
content::Referrer(), location,
ui::PAGE_TRANSITION_LINK, false);
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.mm
index 48afe78..1b3086c19 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.mm
@@ -91,8 +91,9 @@
- (IBAction)switchToProfile:(id)sender {
// Check the event flags to see if a new window should be crated.
- bool always_create = ui::WindowOpenDispositionFromNSEvent(
- [NSApp currentEvent]) == NEW_WINDOW;
+ bool always_create =
+ ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]) ==
+ WindowOpenDisposition::NEW_WINDOW;
menu_->SwitchToProfile([sender menuIndex], always_create,
ProfileMetrics::SWITCH_PROFILE_ICON);
}
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
index 59f80c64..01ac15d 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -1099,8 +1099,9 @@
- (IBAction)switchToProfile:(id)sender {
// Check the event flags to see if a new window should be created.
- bool alwaysCreate = ui::WindowOpenDispositionFromNSEvent(
- [NSApp currentEvent]) == NEW_WINDOW;
+ bool alwaysCreate =
+ ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]) ==
+ WindowOpenDisposition::NEW_WINDOW;
avatarMenu_->SwitchToProfile([sender tag], alwaysCreate,
ProfileMetrics::SWITCH_PROFILE_ICON);
}
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm
index 9d80639..a1475c79 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm
@@ -409,7 +409,7 @@
chrome::NavigateParams params(
browser_, GURL(chrome::kChromeEnterpriseSignInLearnMoreURL),
ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
index f8d9fa69..9ec05b0 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.mm
@@ -90,7 +90,8 @@
- (void)sadTabView:(SadTabView*)sadTabView
helpLinkClickedWithURL:(NSString*)url {
- OpenURLParams params(GURL(url.UTF8String), Referrer(), CURRENT_TAB,
+ OpenURLParams params(GURL(url.UTF8String), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_LINK, false);
webContents_->OpenURL(params);
}
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index 42b280c9..fa209a73 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -2018,7 +2018,7 @@
// Drop in a new tab to the left of tab |i|?
if (point.x < (frame.origin.x + kLRProportion * frame.size.width)) {
*index = i;
- *disposition = NEW_FOREGROUND_TAB;
+ *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
return;
}
@@ -2026,7 +2026,7 @@
if (point.x <= (frame.origin.x +
(1.0 - kLRProportion) * frame.size.width)) {
*index = i;
- *disposition = CURRENT_TAB;
+ *disposition = WindowOpenDisposition::CURRENT_TAB;
return;
}
@@ -2037,7 +2037,7 @@
// If we've made it here, we want to append a new tab to the end.
*index = -1;
- *disposition = NEW_FOREGROUND_TAB;
+ *disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
}
- (void)openURL:(GURL*)url inView:(NSView*)view at:(NSPoint)point {
@@ -2050,7 +2050,7 @@
// Either insert a new tab or open in a current tab.
switch (disposition) {
- case NEW_FOREGROUND_TAB: {
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB: {
content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"));
chrome::NavigateParams params(browser_, *url,
ui::PAGE_TRANSITION_TYPED);
@@ -2061,10 +2061,10 @@
chrome::Navigate(¶ms);
break;
}
- case CURRENT_TAB: {
+ case WindowOpenDisposition::CURRENT_TAB: {
content::RecordAction(UserMetricsAction("Tab_DropURLOnTab"));
- OpenURLParams params(
- *url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ OpenURLParams params(*url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
tabStripModel_->GetWebContentsAt(index)->OpenURL(params);
tabStripModel_->ActivateTabAt(index, true);
break;
@@ -2129,18 +2129,18 @@
NSPoint arrowPos = NSMakePoint(0, arrowBaseY);
if (index == -1) {
// Append a tab at the end.
- DCHECK(disposition == NEW_FOREGROUND_TAB);
+ DCHECK(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB);
NSInteger lastIndex = [tabArray_ count] - 1;
NSRect overRect = [[[tabArray_ objectAtIndex:lastIndex] view] frame];
arrowPos.x = overRect.origin.x + overRect.size.width - kTabOverlap / 2.0;
} else {
NSRect overRect = [[[tabArray_ objectAtIndex:index] view] frame];
switch (disposition) {
- case NEW_FOREGROUND_TAB:
+ case WindowOpenDisposition::NEW_FOREGROUND_TAB:
// Insert tab (to the left of the given tab).
arrowPos.x = overRect.origin.x + kTabOverlap / 2.0;
break;
- case CURRENT_TAB:
+ case WindowOpenDisposition::CURRENT_TAB:
// Overwrite the given tab.
arrowPos.x = overRect.origin.x + overRect.size.width / 2.0;
break;
@@ -2154,7 +2154,7 @@
[tabStripView_ setNeedsDisplay:YES];
// Perform a delayed tab transition if hovering directly over a tab.
- if (index != -1 && disposition == CURRENT_TAB) {
+ if (index != -1 && disposition == WindowOpenDisposition::CURRENT_TAB) {
NSInteger modelIndex = [self modelIndexFromIndex:index];
// Only start the transition if it has a valid model index (i.e. it's not
// in the middle of closing).
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
index 5c4b992..ff8e7ccf 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
@@ -210,10 +210,12 @@
browser(), embedded_test_server()->GetURL("a.com", "/title2.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("b.com", "/title2.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("c.com", "/title2.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Wait for their titles to appear in the TaskManager. There should be three
// rows.
@@ -286,7 +288,7 @@
// Focus and reload one of the sad tabs. It should reappear in the TM. The
// other sad tab should not reappear.
tabs[1]->GetDelegate()->ActivateContents(tabs[1]);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 1), pattern));
// tabs[2] should still be selected.
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index de26ecc..f52d2b95 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -1154,8 +1154,8 @@
browser_->window()->GetLocationBar()->GetOmniboxView()->SetUserText(
OmniboxView::StripJavascriptSchemas(base::UTF8ToUTF16(url.spec())));
}
- OpenURLParams params(
- url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ OpenURLParams params(url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params);
}
@@ -1172,8 +1172,8 @@
metrics::OmniboxEventProto::BLANK, &match, NULL);
GURL url(match.destination_url);
- OpenURLParams params(
- url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false);
+ OpenURLParams params(url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false);
browser_->tab_strip_model()->GetActiveWebContents()->OpenURL(params);
}
diff --git a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
index 27e11baa..d46839811 100644
--- a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
@@ -840,9 +840,9 @@
- (IBAction)handleLanguageSettingsLinkButtonPressed:(id)sender {
GURL url = chrome::GetSettingsUrl(chrome::kLanguageOptionsSubPage);
- webContents_->OpenURL(
- content::OpenURLParams(url, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ webContents_->OpenURL(content::OpenURLParams(
+ url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
translate::ReportUiAction(translate::SETTINGS_LINK_CLICKED);
[self close];
}
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
index 55103fe..b935b4c 100644
--- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -115,21 +115,17 @@
// Open 9 new tabs.
for (int i = 1; i <= 9; ++i) {
CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), false);
- browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
- Referrer(),
- NEW_BACKGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
CheckViewID(static_cast<ViewID>(VIEW_ID_TAB_0 + i), true);
// VIEW_ID_TAB_LAST should always be available.
CheckViewID(VIEW_ID_TAB_LAST, true);
}
// Open the 11th tab.
- browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL),
- Referrer(),
- NEW_BACKGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
+ WindowOpenDisposition::NEW_BACKGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
CheckViewID(VIEW_ID_TAB_LAST, true);
}
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
index 79f2c3d..2af827c 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm
@@ -393,7 +393,8 @@
WebsiteSettings::WEBSITE_SETTINGS_SITE_SETTINGS_OPENED);
webContents_->OpenURL(content::OpenURLParams(
GURL(chrome::kChromeUIContentSettingsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+ false));
}
// Handler for the site settings button below the list of permissions.
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
index 362c1ab..c348742b 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
@@ -71,14 +71,14 @@
void FullscreenControllerTest::GoBack() {
content::TestNavigationObserver observer(
browser()->tab_strip_model()->GetActiveWebContents(), 1);
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
void FullscreenControllerTest::Reload() {
content::TestNavigationObserver observer(
browser()->tab_strip_model()->GetActiveWebContents(), 1);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
}
diff --git a/chrome/browser/ui/extensions/app_launch_params.cc b/chrome/browser/ui/extensions/app_launch_params.cc
index 46ad142..7306b9d 100644
--- a/chrome/browser/ui/extensions/app_launch_params.cc
+++ b/chrome/browser/ui/extensions/app_launch_params.cc
@@ -71,11 +71,11 @@
extensions::LaunchContainer container;
WindowOpenDisposition disposition;
- if (raw_disposition == NEW_FOREGROUND_TAB ||
- raw_disposition == NEW_BACKGROUND_TAB) {
+ if (raw_disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ raw_disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB) {
container = extensions::LAUNCH_CONTAINER_TAB;
disposition = raw_disposition;
- } else if (raw_disposition == NEW_WINDOW) {
+ } else if (raw_disposition == WindowOpenDisposition::NEW_WINDOW) {
container = extensions::LAUNCH_CONTAINER_WINDOW;
disposition = raw_disposition;
} else {
@@ -83,7 +83,7 @@
// is set, launch as a regular tab.
container =
extensions::GetLaunchContainer(ExtensionPrefs::Get(profile), extension);
- disposition = NEW_FOREGROUND_TAB;
+ disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
}
return AppLaunchParams(profile, extension, container, disposition, source);
}
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 7262dfe1..3331731 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -231,7 +231,7 @@
browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
browser->window()->Show();
// There's no current tab in this browser window, so add a new one.
- disposition = NEW_FOREGROUND_TAB;
+ disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
} else {
// For existing browser, ensure its window is shown and activated.
browser->window()->Show();
@@ -251,7 +251,7 @@
params.tabstrip_add_types = add_type;
params.disposition = disposition;
- if (disposition == CURRENT_TAB) {
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
WebContents* existing_tab =
browser->tab_strip_model()->GetActiveWebContents();
TabStripModel* model = browser->tab_strip_model();
@@ -385,7 +385,8 @@
const GURL& url) {
AppLaunchParams launch_params(profile,
NULL, // this is a URL app. No extension.
- extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW,
+ extensions::LAUNCH_CONTAINER_WINDOW,
+ WindowOpenDisposition::NEW_WINDOW,
extensions::SOURCE_COMMAND_LINE);
launch_params.override_url = url;
diff --git a/chrome/browser/ui/extensions/extension_installed_notification.cc b/chrome/browser/ui/extensions/extension_installed_notification.cc
index 87b155d..e424177 100644
--- a/chrome/browser/ui/extensions/extension_installed_notification.cc
+++ b/chrome/browser/ui/extensions/extension_installed_notification.cc
@@ -69,7 +69,7 @@
return;
AppLaunchParams params = CreateAppLaunchParamsUserContainer(
- profile_, extension, NEW_FOREGROUND_TAB,
+ profile_, extension, WindowOpenDisposition::NEW_FOREGROUND_TAB,
extensions::SOURCE_INSTALLED_NOTIFICATION);
OpenApplication(params);
}
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
index 35dec77a..2283780 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
@@ -222,8 +222,8 @@
CheckBubbleIsNotPresent(browser(), false, false);
- chrome::ExecuteCommandWithDisposition(browser(),
- IDC_HOME, NEW_FOREGROUND_TAB);
+ chrome::ExecuteCommandWithDisposition(
+ browser(), IDC_HOME, WindowOpenDisposition::NEW_FOREGROUND_TAB);
base::RunLoop().RunUntilIdle();
CheckBubble(browser(), ANCHOR_BROWSER_ACTION, false);
@@ -249,7 +249,7 @@
omnibox->OnBeforePossibleChange();
omnibox->SetUserText(base::ASCIIToUTF16("search for this"));
omnibox->OnAfterPossibleChange(true);
- omnibox->model()->AcceptInput(CURRENT_TAB, false);
+ omnibox->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB, false);
base::RunLoop().RunUntilIdle();
CheckBubble(browser(), ANCHOR_BROWSER_ACTION, false);
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
index 07b1874f..48b387a 100644
--- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc
+++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -60,7 +60,7 @@
// Launch it in a window.
ASSERT_TRUE(OpenApplication(AppLaunchParams(
browser()->profile(), app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_TEST)));
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST)));
for (auto* b : *BrowserList::GetInstance()) {
if (b == browser())
@@ -199,7 +199,7 @@
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
WebContents* bookmark_app_window = OpenApplication(AppLaunchParams(
browser()->profile(), bookmark_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_UNTRACKED));
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_UNTRACKED));
ASSERT_TRUE(bookmark_app_window);
// Load a packaged app.
@@ -217,7 +217,7 @@
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
WebContents* packaged_app_window = OpenApplication(AppLaunchParams(
browser()->profile(), packaged_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_UNTRACKED));
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_UNTRACKED));
ASSERT_TRUE(packaged_app_window);
DevToolsWindow* devtools_window =
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index c6748fe..1224010 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -864,7 +864,7 @@
content::Source<NavigationController>(
&browser()->tab_strip_model()->GetActiveWebContents()->
GetController()));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
EXPECT_FALSE(fully_visible);
@@ -1420,7 +1420,7 @@
// Open another tab.
GURL url = GetURL(kSimple);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Close it.
@@ -1438,7 +1438,7 @@
chrome::ToggleBookmarkBar(browser());
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EnsureFindBoxOpen();
@@ -1446,7 +1446,7 @@
EXPECT_TRUE(GetFindBarWindowInfo(&position, NULL));
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
chrome::CloseTab(browser());
EXPECT_TRUE(GetFindBarWindowInfo(&position2, NULL));
diff --git a/chrome/browser/ui/ime/ime_window.cc b/chrome/browser/ui/ime/ime_window.cc
index 0e5a428..534a5ea 100644
--- a/chrome/browser/ui/ime/ime_window.cc
+++ b/chrome/browser/ui/ime/ime_window.cc
@@ -71,7 +71,8 @@
}
web_contents_.reset(content::WebContents::Create(create_params));
web_contents_->SetDelegate(this);
- content::OpenURLParams params(gurl, content::Referrer(), SINGLETON_TAB,
+ content::OpenURLParams params(gurl, content::Referrer(),
+ WindowOpenDisposition::SINGLETON_TAB,
ui::PAGE_TRANSITION_LINK, false);
web_contents_->OpenURL(params);
diff --git a/chrome/browser/ui/login/login_handler_browsertest.cc b/chrome/browser/ui/login/login_handler_browsertest.cc
index 84fe0e9..ea67384 100644
--- a/chrome/browser/ui/login/login_handler_browsertest.cc
+++ b/chrome/browser/ui/login/login_handler_browsertest.cc
@@ -154,9 +154,9 @@
observer.Register(content::Source<NavigationController>(controller));
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
load_stop_waiter.Wait();
EXPECT_TRUE(observer.handlers().empty());
@@ -176,9 +176,9 @@
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -226,9 +226,9 @@
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -275,9 +275,7 @@
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("about:blank"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
content::WebContents* contents2 =
@@ -290,7 +288,7 @@
WindowedAuthNeededObserver auth_needed_waiter(controller1);
contents1->OpenURL(OpenURLParams(
embedded_test_server()->GetURL(kAuthBasicPage), Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -298,7 +296,7 @@
WindowedAuthNeededObserver auth_needed_waiter(controller2);
contents2->OpenURL(OpenURLParams(
embedded_test_server()->GetURL(kAuthDigestPage), Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -336,7 +334,8 @@
WindowedLoadStopObserver load_stop_waiter(controller, 1);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
@@ -364,12 +363,14 @@
const int kLoadStopEvents = 2;
WindowedLoadStopObserver load_stop_waiter(controller, kLoadStopEvents);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
// Navigating while auth is requested is the same as cancelling.
- browser()->OpenURL(OpenURLParams(kNoAuthURL, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(kNoAuthURL, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_cancelled_waiter.Wait();
load_stop_waiter.Wait();
@@ -396,7 +397,8 @@
const int kLoadStopEvents = 2;
WindowedLoadStopObserver load_stop_waiter(controller, kLoadStopEvents);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
@@ -436,7 +438,8 @@
const int kLoadStopEvents = 2;
WindowedLoadStopObserver load_stop_waiter(controller, kLoadStopEvents);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(kAuthURL, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
@@ -467,9 +470,9 @@
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -519,9 +522,9 @@
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -565,9 +568,9 @@
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -637,9 +640,9 @@
{
GURL test_page = embedded_test_server()->GetURL(kFaviconTestPage);
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
load_stop_waiter.Wait();
}
@@ -649,9 +652,9 @@
GURL test_page = embedded_test_server()->GetURL(kFaviconResource);
WindowedLoadStopObserver load_stop_waiter(controller, 1);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
ASSERT_EQ(1u, observer.handlers().size());
@@ -700,9 +703,9 @@
test_page = test_page.ReplaceComponents(replacements);
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
load_stop_waiter.Wait();
}
@@ -721,9 +724,9 @@
test_page = test_page.ReplaceComponents(replacements);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
ASSERT_EQ(1u, observer.handlers().size());
@@ -768,9 +771,9 @@
test_page = test_page.ReplaceComponents(replacements);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
ASSERT_EQ(1u, observer.handlers().size());
@@ -805,9 +808,7 @@
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("about:blank"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Get NavigationController for tab 2.
@@ -825,17 +826,11 @@
WindowedAuthNeededObserver auth_needed_waiter_1(controller_1);
WindowedAuthNeededObserver auth_needed_waiter_2(controller_2);
contents_1->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/1"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/1"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
contents_2->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/2"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/2"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter_1.Wait();
auth_needed_waiter_2.Wait();
@@ -868,9 +863,7 @@
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL("about:blank"),
- NEW_FOREGROUND_TAB,
+ browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Get NavigationController for tab 2.
@@ -888,17 +881,11 @@
WindowedAuthNeededObserver auth_needed_waiter_1(controller_1);
WindowedAuthNeededObserver auth_needed_waiter_2(controller_2);
contents_1->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/1"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/1"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
contents_2->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/2"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/2"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter_1.Wait();
auth_needed_waiter_2.Wait();
@@ -952,17 +939,11 @@
WindowedAuthNeededObserver auth_needed_waiter_incognito(
controller_incognito);
contents->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/1"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/1"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
contents_incognito->OpenURL(OpenURLParams(
- embedded_test_server()->GetURL("/auth-basic/2"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ embedded_test_server()->GetURL("/auth-basic/2"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
auth_needed_waiter_incognito.Wait();
@@ -1013,9 +994,9 @@
{
GURL test_page = embedded_test_server()->GetURL(kXHRTestPage);
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
load_stop_waiter.Wait();
}
@@ -1047,9 +1028,9 @@
{
GURL test_page = embedded_test_server()->GetURL(kXHRTestPage);
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
load_stop_waiter.Wait();
}
@@ -1081,9 +1062,9 @@
{
GURL test_page = embedded_test_server()->GetURL(kXHRTestPage);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -1144,9 +1125,9 @@
{
GURL test_page = embedded_test_server()->GetURL(kXHRTestPage);
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
}
@@ -1183,7 +1164,8 @@
// Load a page which will trigger a login prompt.
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(visit_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(visit_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_EQ(visit_url.host(), contents->GetVisibleURL().host());
auth_needed_waiter.Wait();
@@ -1325,9 +1307,9 @@
ASSERT_EQ("127.0.0.1", test_page.host());
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(
- test_page, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
ASSERT_EQ("127.0.0.1", contents->GetURL().host());
content::WaitForInterstitialAttach(contents);
@@ -1396,7 +1378,8 @@
// Navigate to an auth url and wait for the login prompt.
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(auth_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(auth_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_EQ("127.0.0.1", contents->GetURL().host());
ASSERT_TRUE(contents->GetURL().SchemeIs("http"));
@@ -1421,7 +1404,8 @@
// schemes don't match (http vs https).
{
ASSERT_EQ("127.0.0.1", broken_ssl_page.host());
- browser()->OpenURL(OpenURLParams(broken_ssl_page, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(broken_ssl_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_EQ("127.0.0.1", contents->GetURL().host());
ASSERT_TRUE(contents->GetURL().SchemeIs("https"));
@@ -1440,7 +1424,8 @@
// last committed URL and the new URL is the same.
{
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(auth_url, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(auth_url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
ASSERT_EQ("127.0.0.1", contents->GetURL().host());
ASSERT_TRUE(contents->GetURL().SchemeIs("http"));
@@ -1483,7 +1468,8 @@
GURL broken_ssl_page = https_server.GetURL("/");
ASSERT_EQ("127.0.0.1", test_page.host());
WindowedAuthNeededObserver auth_needed_waiter(controller);
- browser()->OpenURL(OpenURLParams(test_page, Referrer(), CURRENT_TAB,
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_TYPED, false));
auth_needed_waiter.Wait();
ASSERT_EQ(1u, observer.handlers().size());
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 9fea9c0..35b02b4 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -692,7 +692,7 @@
GURL url2("data:text/html,page2");
chrome::NavigateParams params(browser(), url2, ui::PAGE_TRANSITION_LINK);
params.source_contents = contents;
- params.disposition = CURRENT_TAB;
+ params.disposition = WindowOpenDisposition::CURRENT_TAB;
ui_test_utils::NavigateToURL(¶ms);
// Switch back to the first tab. The user text should be cleared, and the
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
index 6a2c3b0..f73ebcde 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -327,7 +327,7 @@
chrome::FindBrowserWithWebContents(web_contents()),
GURL(password_manager::kPasswordManagerAccountDashboardURL),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
@@ -335,7 +335,7 @@
chrome::NavigateParams params(
chrome::FindBrowserWithWebContents(web_contents()),
GURL(chrome::kSmartLockHelpPage), ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 6622061..52a428e 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -128,9 +128,9 @@
// Launch the url to get the latest Adbobe Reader installer.
void OpenReaderUpdateURL(WebContents* web_contents) {
- OpenURLParams params(
- GURL(kAdobeReaderUpdateUrl), Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ OpenURLParams params(GURL(kAdobeReaderUpdateUrl), Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
web_contents->OpenURL(params);
}
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index fbf196d..2e70e92 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -395,11 +395,10 @@
// Open new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
// Make sure new tab received the onmostvisitedchanged event once.
@@ -428,11 +427,10 @@
// The "Instant" New Tab should have access to chrome-search: scheme but not
// chrome: scheme.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::RenderViewHost* rvh =
browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
@@ -459,11 +457,10 @@
// Open new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
content::WebContents* active_tab =
@@ -501,11 +498,10 @@
// Open new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
// Make sure new tab received an onthemechanged event.
@@ -534,11 +530,10 @@
// Open a new tab page.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
EXPECT_EQ(2, browser()->tab_strip_model()->count());
SetOmniboxText("flowers");
@@ -568,11 +563,10 @@
// Open new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* active_tab =
browser()->tab_strip_model()->GetActiveWebContents();
@@ -619,10 +613,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
new_tab_observer.Wait();
OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 0;
@@ -685,10 +677,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
new_tab_observer.Wait();
OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 0;
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
index df4ec7f..578cac2 100644
--- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
@@ -100,10 +100,8 @@
content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::NotificationService::AllSources());
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- CURRENT_TAB,
- ui_test_utils::BROWSER_TEST_NONE);
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
observer.Wait();
content::WebContents* active_tab =
browser()->tab_strip_model()->GetActiveWebContents();
diff --git a/chrome/browser/ui/search/instant_search_prerenderer.cc b/chrome/browser/ui/search/instant_search_prerenderer.cc
index 9aa3ffd..95d179f7 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer.cc
@@ -133,7 +133,7 @@
if (search_terms.empty() || !params->target_contents ||
!prerender_contents() || !prerender_manager ||
!QueryMatchesPrefetch(search_terms) ||
- params->disposition != CURRENT_TAB) {
+ params->disposition != WindowOpenDisposition::CURRENT_TAB) {
Cancel();
return false;
}
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index 134d81f..b3b2424 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -355,9 +355,9 @@
// Open a search results page. A prerendered page exists for |url|. Make sure
// the browser swaps the current tab contents with the prerendered contents.
GURL url("https://www.google.com/alt#quux=foo&strk");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
}
@@ -373,9 +373,9 @@
// Open a search results page. Prerendered page does not exists for |url|.
// Make sure the browser navigates the current tab to this |url|.
GURL url("https://www.google.com/alt#quux=foo&strk");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(url, GetActiveWebContents()->GetURL());
}
@@ -388,9 +388,9 @@
// prerendered search query("foo"). Make sure the browser swaps the current
// tab contents with the prerendered contents.
GURL url("https://www.google.com/alt#quux=pen&strk");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
}
@@ -402,9 +402,9 @@
// Open a search results page. Make sure the InstantSearchPrerenderer cancels
// the active prerender request upon the receipt of empty search query.
GURL url("https://www.google.com/alt#quux=&strk");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(url, GetActiveWebContents()->GetURL());
EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
@@ -417,9 +417,9 @@
// Open a search results page. Make sure the InstantSearchPrerenderer cancels
// the active prerender request for unsupported window dispositions.
GURL url("https://www.google.com/alt#quux=pen&strk");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(
+ url, Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
content::WebContents* new_tab =
browser()->tab_strip_model()->GetWebContentsAt(1);
EXPECT_NE(GetPrerenderURL(), new_tab->GetURL());
@@ -482,9 +482,9 @@
// key. Make sure UsePrerenderedPage() extracts the search terms from the URL
// and uses the prerendered page contents.
GURL url("https://www.google.com/alt#quux=foo");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED,
- false));
+ browser()->OpenURL(content::OpenURLParams(url, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
EXPECT_EQ(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
}
@@ -494,9 +494,9 @@
// Do not use prerendered page for renderer initiated search request.
GURL url("https://www.google.com/alt#quux=foo");
- browser()->OpenURL(content::OpenURLParams(url, Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_LINK,
- true /* is_renderer_initiated */));
+ browser()->OpenURL(content::OpenURLParams(
+ url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, true /* is_renderer_initiated */));
EXPECT_NE(GetPrerenderURL(), GetActiveWebContents()->GetURL());
EXPECT_EQ(static_cast<PrerenderHandle*>(NULL), prerender_handle());
}
@@ -509,7 +509,8 @@
// trials. Search results page URL does not contain search terms replacement
// key.
GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
- browser()->instant_controller()->OpenInstant(CURRENT_TAB, url);
+ browser()->instant_controller()->OpenInstant(
+ WindowOpenDisposition::CURRENT_TAB, url);
content::MockRenderProcessHost* process =
static_cast<content::MockRenderProcessHost*>(
prerender_contents()->GetRenderViewHost()->GetProcess());
diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
index 4d3c4bf..61fcae05 100644
--- a/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
@@ -37,11 +37,9 @@
FocusOmnibox();
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- ntp_url(),
- NEW_FOREGROUND_TAB,
+ browser(), ntp_url(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
content::WebContents* active_tab =
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(search::IsInstantNTP(active_tab));
@@ -76,11 +74,10 @@
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUINewTabURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Verify that the NTP is in French.
content::WebContents* active_tab =
diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc
index 9a8d599..0567638 100644
--- a/chrome/browser/ui/settings_window_manager.cc
+++ b/chrome/browser/ui/settings_window_manager.cc
@@ -60,7 +60,7 @@
// No existing browser window, create one.
NavigateParams params(profile, gurl, ui::PAGE_TRANSITION_AUTO_BOOKMARK);
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.trusted_source = true;
params.window_action = NavigateParams::SHOW_WINDOW;
params.user_gesture = true;
diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc
index 870e8df..042f85ff 100644
--- a/chrome/browser/ui/singleton_tabs.cc
+++ b/chrome/browser/ui/singleton_tabs.cc
@@ -54,7 +54,7 @@
search::IsInstantNTP(contents) ||
contents_url == GURL(url::kAboutBlankURL)) &&
GetIndexOfSingletonTab(&local_params) < 0) {
- local_params.disposition = CURRENT_TAB;
+ local_params.disposition = WindowOpenDisposition::CURRENT_TAB;
}
}
@@ -64,7 +64,7 @@
NavigateParams GetSingletonTabNavigateParams(Browser* browser,
const GURL& url) {
NavigateParams params(browser, url, ui::PAGE_TRANSITION_AUTO_BOOKMARK);
- params.disposition = SINGLETON_TAB;
+ params.disposition = WindowOpenDisposition::SINGLETON_TAB;
params.window_action = NavigateParams::SHOW_WINDOW;
params.user_gesture = true;
params.tabstrip_add_types |= TabStripModel::ADD_INHERIT_OPENER;
@@ -74,7 +74,7 @@
// Returns the index of an existing singleton tab in |params->browser| matching
// the URL specified in |params|.
int GetIndexOfSingletonTab(NavigateParams* params) {
- if (params->disposition != SINGLETON_TAB)
+ if (params->disposition != WindowOpenDisposition::SINGLETON_TAB)
return -1;
// In case the URL was rewritten by the BrowserURLHandler we need to ensure
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 54d468b..0e66bf5 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -323,9 +323,9 @@
// specially here, otherwise it will be handled below.
if (extension) {
RecordCmdLineAppHistogram(extensions::Manifest::TYPE_PLATFORM_APP);
- AppLaunchParams params(profile, extension,
- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,
- extensions::SOURCE_COMMAND_LINE);
+ AppLaunchParams params(
+ profile, extension, extensions::LAUNCH_CONTAINER_NONE,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_COMMAND_LINE);
params.command_line = command_line_;
params.current_directory = cur_dir_;
::OpenApplicationWithReenablePrompt(params);
@@ -426,7 +426,8 @@
WebContents* app_tab = ::OpenApplication(
AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_TAB,
- NEW_FOREGROUND_TAB, extensions::SOURCE_COMMAND_LINE));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ extensions::SOURCE_COMMAND_LINE));
return (app_tab != NULL);
}
@@ -454,7 +455,8 @@
RecordCmdLineAppHistogram(extension->GetType());
- AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW,
+ AppLaunchParams params(profile, extension, launch_container,
+ WindowOpenDisposition::NEW_WINDOW,
extensions::SOURCE_COMMAND_LINE);
params.command_line = command_line_;
params.current_directory = cur_dir_;
@@ -755,7 +757,8 @@
chrome::NavigateParams params(browser, tabs[i].url,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
- params.disposition = first_tab ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+ params.disposition = first_tab ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB;
params.tabstrip_add_types = add_types;
#if defined(ENABLE_RLZ)
diff --git a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
index 6c8a66d..71f0cbe5 100644
--- a/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
+++ b/chrome/browser/ui/sync/one_click_signin_links_delegate_impl.cc
@@ -19,7 +19,8 @@
void OneClickSigninLinksDelegateImpl::OnLearnMoreLinkClicked(bool is_dialog) {
chrome::NavigateParams params(browser_, GURL(chrome::kChromeSyncLearnMoreURL),
ui::PAGE_TRANSITION_LINK);
- params.disposition = is_dialog ? NEW_WINDOW : NEW_FOREGROUND_TAB;
+ params.disposition = is_dialog ? WindowOpenDisposition::NEW_WINDOW
+ : WindowOpenDisposition::NEW_FOREGROUND_TAB;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index 1041812..e333a75c 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -627,11 +627,9 @@
}
GURL url = chrome::GetSettingsUrl(sub_page);
- content::OpenURLParams params(url,
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false);
+ content::OpenURLParams params(url, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false);
contents->OpenURL(params);
// Activate the tab.
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc
index e1e9cd3..8a65be6 100644
--- a/chrome/browser/ui/tab_contents/core_tab_helper.cc
+++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -381,7 +381,7 @@
return;
content::OpenURLParams open_url_params(
- result, content::Referrer(), NEW_FOREGROUND_TAB,
+ result, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
const std::string& content_type = post_content.first;
const std::string& post_data = post_content.second;
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index 7f1d2f45..45bbfa29 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -120,11 +120,9 @@
}
IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Navigate) {
- content::OpenURLParams params(GURL("about:blank"),
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::OpenURLParams params(GURL("about:blank"), content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
browser()->tab_strip_model()->GetActiveWebContents()->OpenURL(params);
EXPECT_EQ(0, accepted_count_);
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
index a79c9d9..c450c4e7 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -292,8 +292,10 @@
WindowOpenDisposition disposition =
ui::DispositionFromEventFlags(event_flags);
- if (disposition == CURRENT_TAB) // Force to open a new foreground tab.
- disposition = NEW_FOREGROUND_TAB;
+ if (disposition == WindowOpenDisposition::CURRENT_TAB) {
+ // Force to open a new foreground tab.
+ disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
+ }
sessions::TabRestoreService* service =
TabRestoreServiceFactory::GetForProfile(browser_->profile());
diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc
index c92e364..49f4932 100644
--- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc
+++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc
@@ -154,7 +154,9 @@
ui::DispositionFromEventFlags(event_flags);
content::OpenURLParams params(
GURL(url), content::Referrer(),
- disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
+ disposition == WindowOpenDisposition::CURRENT_TAB
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : disposition,
ui::PAGE_TRANSITION_LINK, false);
browser_->OpenURL(params);
}
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 93d769c..a3d5c34 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -412,7 +412,8 @@
// ignored.
return BookmarkMenuButtonBase::IsTriggerableEventType(e) ||
(e.IsMouseEvent() &&
- ui::DispositionFromEventFlags(e.flags()) != CURRENT_TAB);
+ ui::DispositionFromEventFlags(e.flags()) !=
+ WindowOpenDisposition::CURRENT_TAB);
}
private:
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
index 5f4997e..e9eb06d 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -133,7 +133,8 @@
// Tests open all on a folder with a couple of bookmarks.
TEST_F(BookmarkContextMenuTest, OpenAll) {
const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
- chrome::OpenAll(NULL, &navigator_, folder, NEW_FOREGROUND_TAB, NULL);
+ chrome::OpenAll(NULL, &navigator_, folder,
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, NULL);
// Should have navigated to F1's child but not F11's child.
ASSERT_EQ(static_cast<size_t>(2), navigator_.urls_.size());
@@ -143,7 +144,8 @@
// Tests open all on a folder with a couple of bookmarks in incognito window.
TEST_F(BookmarkContextMenuTest, OpenAllIngonito) {
const BookmarkNode* folder = model_->bookmark_bar_node()->GetChild(1);
- chrome::OpenAll(NULL, &navigator_, folder, OFF_THE_RECORD, NULL);
+ chrome::OpenAll(NULL, &navigator_, folder,
+ WindowOpenDisposition::OFF_THE_RECORD, NULL);
// Should have navigated to only f1a but not f2a.
ASSERT_EQ(static_cast<size_t>(1), navigator_.urls_.size());
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
index 7d371348..30dd8ce 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -176,7 +176,8 @@
int id,
const ui::Event& event) {
return (event.flags() & ui::EF_LEFT_MOUSE_BUTTON) &&
- ui::DispositionFromEventFlags(event.flags()) == NEW_BACKGROUND_TAB;
+ ui::DispositionFromEventFlags(event.flags()) ==
+ WindowOpenDisposition::NEW_BACKGROUND_TAB;
}
bool BookmarkMenuDelegate::GetDropFormats(
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc
index 2afe6b6e..e8b1797 100644
--- a/chrome/browser/ui/views/conflicting_module_view_win.cc
+++ b/chrome/browser/ui/views/conflicting_module_view_win.cc
@@ -115,9 +115,10 @@
}
bool ConflictingModuleView::Accept() {
- browser_->OpenURL(content::OpenURLParams(
- help_center_url_, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ browser_->OpenURL(
+ content::OpenURLParams(help_center_url_, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
EnumerateModulesModel::GetInstance()->AcknowledgeConflictNotification();
return true;
}
diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
index 87e155c8..9eed170 100644
--- a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
+++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc
@@ -156,8 +156,9 @@
ui::DispositionFromEventFlags(event_flags);
content::OpenURLParams params(
GURL(l10n_util::GetStringUTF8(IDS_SAFE_BROWSING_PRIVACY_POLICY_URL)),
- content::Referrer(),
- disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
+ content::Referrer(), disposition == WindowOpenDisposition::CURRENT_TAB
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : disposition,
ui::PAGE_TRANSITION_LINK, false);
navigator_->OpenURL(params);
}
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index 817119c..5fb8287 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -537,10 +537,9 @@
int event_flags) {
GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() +
prompt_->extension()->id());
- OpenURLParams params(
- store_url, Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ OpenURLParams params(store_url, Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
if (navigator_) {
navigator_->OpenURL(params);
diff --git a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
index 3bafc2bf..30fc8c47 100644
--- a/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc
@@ -498,7 +498,7 @@
EXPECT_EQ(ASCIIToUTF16("a"), GetFindBarText());
// Reload the page to clear the matching result.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
// Focus the Find bar again to make sure the text is selected.
browser()->GetFindBarController()->Show();
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9bdc2b2..e3cbe9f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1517,7 +1517,7 @@
WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
const gfx::Rect& bounds) {
- return NEW_POPUP;
+ return WindowOpenDisposition::NEW_POPUP;
}
FindBar* BrowserView::CreateFindBar() {
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
index 0c19abe7..699c1a2b 100644
--- a/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
+++ b/chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc
@@ -241,7 +241,7 @@
OpenApplication(AppLaunchParams(
browser()->profile(), extension, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_FOREGROUND_TAB, extensions::SOURCE_TEST));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, extensions::SOURCE_TEST));
// Check that the new browser has an app name.
// The launch should have created a new browser.
diff --git a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
index f38f353..3e3e8a6e 100644
--- a/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
+++ b/chrome/browser/ui/views/frame/global_menu_bar_x11.cc
@@ -850,15 +850,13 @@
TabRestoreServiceFactory::GetForProfile(profile_);
if (item->session_id && service) {
service->RestoreEntryById(browser_->live_tab_context(), item->session_id,
- UNKNOWN);
+ WindowOpenDisposition::UNKNOWN);
} else {
DCHECK(item->url.is_valid());
- browser_->OpenURL(content::OpenURLParams(
- item->url,
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_BOOKMARK,
- false));
+ browser_->OpenURL(
+ content::OpenURLParams(item->url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
}
}
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
index f53a1cf2..6a78a69 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
+++ b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
@@ -47,8 +47,9 @@
// We create |web_contents| since the Bubble UI has an Observer that
// depends on this, otherwise it wouldn't work.
GURL url("http://www.google.com");
- WebContents* web_contents = browser()->OpenURL(OpenURLParams(
- url, Referrer(), CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
+ WebContents* web_contents = browser()->OpenURL(
+ OpenURLParams(url, Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
bubble_ = IntentPickerBubbleView::CreateBubbleView(
app_info_, base::Bind(&IntentPickerBubbleViewTest::OnBubbleClosed,
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index e97ee81..5f6abc8 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -399,7 +399,7 @@
"</script></html>";
GURL url("data:text/html," + kBadPage);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
@@ -407,7 +407,7 @@
ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_EQ(2, browser()->tab_strip_model()->active_index());
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 979ddac9..fe83550 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1092,7 +1092,8 @@
}
void LocationBarView::AcceptInput() {
- omnibox_view_->model()->AcceptInput(CURRENT_TAB, false);
+ omnibox_view_->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB,
+ false);
}
void LocationBarView::FocusSearch() {
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
index 217be79c..2659688 100644
--- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -116,7 +116,7 @@
// Reload the browser and wait.
content::TestNavigationObserver reload_observer(
browser()->tab_strip_model()->GetActiveWebContents());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
reload_observer.Wait();
// The reload should have removed the previously created dialog.
diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc
index 744c896..0e6e54e5 100644
--- a/chrome/browser/ui/views/network_profile_bubble_view.cc
+++ b/chrome/browser/ui/views/network_profile_bubble_view.cc
@@ -110,9 +110,10 @@
ui::DispositionFromEventFlags(event_flags);
content::OpenURLParams params(
GURL("https://sites.google.com/a/chromium.org/dev/administrators/"
- "common-problems-and-solutions#network_profile"),
- content::Referrer(),
- disposition == CURRENT_TAB ? NEW_FOREGROUND_TAB : disposition,
+ "common-problems-and-solutions#network_profile"),
+ content::Referrer(), disposition == WindowOpenDisposition::CURRENT_TAB
+ ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : disposition,
ui::PAGE_TRANSITION_LINK, false);
navigator_->OpenURL(params);
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index 59b0f65..4081c79 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -367,8 +367,9 @@
}
if (event.IsOnlyMiddleMouseButton() || event.IsOnlyLeftMouseButton()) {
- OpenSelectedLine(event, event.IsOnlyLeftMouseButton() ? CURRENT_TAB :
- NEW_BACKGROUND_TAB);
+ OpenSelectedLine(event, event.IsOnlyLeftMouseButton()
+ ? WindowOpenDisposition::CURRENT_TAB
+ : WindowOpenDisposition::NEW_BACKGROUND_TAB);
}
}
@@ -400,7 +401,7 @@
break;
case ui::ET_GESTURE_TAP:
case ui::ET_GESTURE_SCROLL_END:
- OpenSelectedLine(*event, CURRENT_TAB);
+ OpenSelectedLine(*event, WindowOpenDisposition::CURRENT_TAB);
break;
default:
return;
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 30fc8ba..37fcfc8 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -903,7 +903,9 @@
const bool alt = event.IsAltDown() || event.IsAltGrDown();
switch (event.key_code()) {
case ui::VKEY_RETURN:
- model()->AcceptInput(alt ? NEW_FOREGROUND_TAB : CURRENT_TAB, false);
+ model()->AcceptInput(alt ? WindowOpenDisposition::NEW_FOREGROUND_TAB
+ : WindowOpenDisposition::CURRENT_TAB,
+ false);
return true;
case ui::VKEY_ESCAPE:
return model()->OnEscapeKeyPressed();
diff --git a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
index aac7ae19..f525c1dc 100644
--- a/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
+++ b/chrome/browser/ui/views/outdated_upgrade_bubble_view.cc
@@ -125,9 +125,10 @@
kNumIgnoredBuckets);
content::RecordAction(
base::UserMetricsAction("OutdatedUpgradeBubble.Reinstall"));
- navigator_->OpenURL(content::OpenURLParams(
- GURL(kDownloadChromeUrl), content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ navigator_->OpenURL(
+ content::OpenURLParams(GURL(kDownloadChromeUrl), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
#if defined(OS_WIN)
} else {
DCHECK(UpgradeDetector::GetInstance()->is_outdated_install_no_au());
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index 50f4325e..cd0b63b 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -1101,8 +1101,8 @@
open_other_profile_indexes_map_.find(sender);
if (profile_match != open_other_profile_indexes_map_.end()) {
avatar_menu_->SwitchToProfile(
- profile_match->second,
- ui::DispositionFromEventFlags(event.flags()) == NEW_WINDOW,
+ profile_match->second, ui::DispositionFromEventFlags(event.flags()) ==
+ WindowOpenDisposition::NEW_WINDOW,
ProfileMetrics::SWITCH_PROFILE_ICON);
} else {
// This was a profile accounts button.
diff --git a/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc b/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc
index 7add3fb6e..306c9ec 100644
--- a/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc
+++ b/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc
@@ -138,7 +138,7 @@
if (!web_contents())
return;
- web_contents()->OpenURL(
- content::OpenURLParams(link_url_, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ web_contents()->OpenURL(content::OpenURLParams(
+ link_url_, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 46198a4..0976a8f 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -206,10 +206,11 @@
void SadTabView::LinkClicked(views::Link* source, int event_flags) {
DCHECK(web_contents_);
- OpenURLParams params(GURL(total_crashes_ > kCrashesBeforeFeedbackIsDisplayed ?
- chrome::kCrashReasonFeedbackDisplayedURL :
- chrome::kCrashReasonURL), content::Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false);
+ OpenURLParams params(GURL(total_crashes_ > kCrashesBeforeFeedbackIsDisplayed
+ ? chrome::kCrashReasonFeedbackDisplayedURL
+ : chrome::kCrashReasonURL),
+ content::Referrer(), WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
web_contents_->OpenURL(params);
}
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
index 2da83f6..d8a54325 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -366,7 +366,7 @@
chrome::NavigateParams p(browser(), GURL("http://www.google.com"),
ui::PAGE_TRANSITION_LINK);
p.window_action = chrome::NavigateParams::SHOW_WINDOW;
- p.disposition = SINGLETON_TAB;
+ p.disposition = WindowOpenDisposition::SINGLETON_TAB;
chrome::Navigate(&p);
// Press cancel button.
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc
index f45bebb9..eb8caab 100644
--- a/chrome/browser/ui/views/session_crashed_bubble_view.cc
+++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc
@@ -360,10 +360,8 @@
int event_flags) {
browser_->OpenURL(content::OpenURLParams(
GURL("https://support.google.com/chrome/answer/96817"),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_HELP);
}
diff --git a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
index 62735775..c8308cf 100644
--- a/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
+++ b/chrome/browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc
@@ -235,7 +235,7 @@
browser_,
GURL("https://support.google.com/chromebook/answer/1331549"),
ui::PAGE_TRANSITION_LINK);
- params.disposition = NEW_POPUP;
+ params.disposition = WindowOpenDisposition::NEW_POPUP;
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
chrome::Navigate(¶ms);
}
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index f73984c..4253caaa 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -352,10 +352,10 @@
if (drop_before) {
content::RecordAction(UserMetricsAction("Tab_DropURLBetweenTabs"));
- params.disposition = NEW_FOREGROUND_TAB;
+ params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
} else {
content::RecordAction(UserMetricsAction("Tab_DropURLOnTab"));
- params.disposition = CURRENT_TAB;
+ params.disposition = WindowOpenDisposition::CURRENT_TAB;
params.source_contents = model_->GetWebContentsAt(index);
}
params.window_action = chrome::NavigateParams::SHOW_WINDOW;
diff --git a/chrome/browser/ui/views/task_manager_view_browsertest.cc b/chrome/browser/ui/views/task_manager_view_browsertest.cc
index eb9ddc11..d6f996e 100644
--- a/chrome/browser/ui/views/task_manager_view_browsertest.cc
+++ b/chrome/browser/ui/views/task_manager_view_browsertest.cc
@@ -200,7 +200,8 @@
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("b.com", "/title3.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// When the task manager is initially shown, the row for the active tab should
// be selected.
@@ -235,10 +236,12 @@
browser(), embedded_test_server()->GetURL("a.com", "/title2.html"));
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("b.com", "/title2.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ui_test_utils::NavigateToURLWithDisposition(
browser(), embedded_test_server()->GetURL("c.com", "/title2.html"),
- NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Wait for their titles to appear in the TaskManager. There should be three
// rows.
@@ -310,7 +313,7 @@
// Focus and reload one of the sad tabs. It should reappear in the TM. The
// other sad tab should not reappear.
tabs[1]->GetDelegate()->ActivateContents(tabs[1]);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows((rows += 1), pattern));
// tabs[2] should still be selected.
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
index 3f331c5..6a73e534 100644
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -139,7 +139,8 @@
if (visible_mode_ == MODE_STOP) {
if (command_updater_)
- command_updater_->ExecuteCommandWithDisposition(IDC_STOP, CURRENT_TAB);
+ command_updater_->ExecuteCommandWithDisposition(
+ IDC_STOP, WindowOpenDisposition::CURRENT_TAB);
// The user has clicked, so we can feel free to update the button,
// even if the mouse is still hovering.
ChangeMode(MODE_RELOAD, true);
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc
index 3b6372d..dfc63dd5 100644
--- a/chrome/browser/ui/views/translate/translate_bubble_view.cc
+++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc
@@ -465,9 +465,9 @@
}
case LINK_ID_LANGUAGE_SETTINGS: {
GURL url = chrome::GetSettingsUrl(chrome::kLanguageOptionsSubPage);
- web_contents()->OpenURL(
- content::OpenURLParams(url, content::Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false));
+ web_contents()->OpenURL(content::OpenURLParams(
+ url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
translate::ReportUiAction(translate::SETTINGS_LINK_CLICKED);
break;
}
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
index 3c5be53..4d987b0 100644
--- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -222,7 +222,7 @@
IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, CloseParentWindow) {
// Open a second browser window so we don't trigger shutdown.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(url::kAboutBlankURL), NEW_WINDOW,
+ browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW,
ui_test_utils::BROWSER_TEST_NONE);
// TestWebDialogDelegate defaults to window-modal, so closing the browser
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index a2fcb64a..a0095c1 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -809,7 +809,8 @@
// desktop we should link to that here, too.
web_contents()->OpenURL(content::OpenURLParams(
GURL(chrome::kChromeUIContentSettingsURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK, false));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+ false));
presenter_->RecordWebsiteSettingsAction(
WebsiteSettings::WEBSITE_SETTINGS_SITE_SETTINGS_OPENED);
} else {
diff --git a/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.cc b/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.cc
index 25b46b7..bfc40de 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.cc
@@ -42,9 +42,9 @@
LoadExtension(test_data_dir_.AppendASCII("app_with_panel_container/"));
CHECK(extension);
- AppLaunchParams params(browser()->profile(), extension,
- extensions::LAUNCH_CONTAINER_PANEL, NEW_WINDOW,
- extensions::SOURCE_TEST);
+ AppLaunchParams params(
+ browser()->profile(), extension, extensions::LAUNCH_CONTAINER_PANEL,
+ WindowOpenDisposition::NEW_WINDOW, extensions::SOURCE_TEST);
content::WebContents* app_window = OpenApplication(params);
CHECK(app_window);
diff --git a/chrome/browser/ui/webui/chrome_web_contents_handler.cc b/chrome/browser/ui/webui/chrome_web_contents_handler.cc
index 4bc2b65..7f5fd4d08 100644
--- a/chrome/browser/ui/webui/chrome_web_contents_handler.cc
+++ b/chrome/browser/ui/webui/chrome_web_contents_handler.cc
@@ -43,10 +43,11 @@
browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
chrome::NavigateParams nav_params(browser, params.url, params.transition);
nav_params.referrer = params.referrer;
- if (source && source->IsCrashed() && params.disposition == CURRENT_TAB &&
+ if (source && source->IsCrashed() &&
+ params.disposition == WindowOpenDisposition::CURRENT_TAB &&
ui::PageTransitionCoreTypeIs(params.transition,
ui::PAGE_TRANSITION_LINK)) {
- nav_params.disposition = NEW_FOREGROUND_TAB;
+ nav_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
} else {
nav_params.disposition = params.disposition;
}
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index cd2d58a6..6d2bf4c 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -407,11 +407,9 @@
void KeyboardOverlayHandler::OpenLearnMorePage(const base::ListValue* args) {
web_ui()->GetWebContents()->GetDelegate()->OpenURLFromTab(
web_ui()->GetWebContents(),
- content::OpenURLParams(GURL(kLearnMoreURL),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ content::OpenURLParams(GURL(kLearnMoreURL), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index 3bc320d..8dfead1 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -370,11 +370,9 @@
WebContents* inspect_ui = web_ui()->GetWebContents();
WebContents* front_end = inspect_ui->GetDelegate()->OpenURLFromTab(
inspect_ui,
- content::OpenURLParams(frontend_url,
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false));
+ content::OpenURLParams(frontend_url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
// Install devtools bindings.
DevToolsUIBindingsEnabler* bindings_enabler =
diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
index e2ae3c64..e0c14b5 100644
--- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
@@ -51,9 +51,8 @@
ui_test_utils::NavigateToURL(browser(), url);
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(chrome::kChromeUIInspectURL),
- NEW_FOREGROUND_TAB,
+ browser(), GURL(chrome::kChromeUIInspectURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index fa88541..89bb63f 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -561,7 +561,8 @@
// Open the connector enable page in the current tab.
content::OpenURLParams params(cloud_devices::GetCloudPrintEnableURL(
GetCloudPrintProxyService()->proxy_id()),
- content::Referrer(), CURRENT_TAB,
+ content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
ui::PAGE_TRANSITION_LINK, false);
web_ui()->GetWebContents()->OpenURL(params);
}
diff --git a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
index fb71fa2c..3c61ad8 100644
--- a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
+++ b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc
@@ -59,7 +59,7 @@
uint32_t history_frame_url_hash = base::Hash(history_frame_url.spec());
EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1)));
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2)));
}
@@ -93,7 +93,7 @@
{
content::TitleWatcher title_watcher(tab, history_title);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
ASSERT_EQ(history_title, title_watcher.WaitAndGetTitle());
}
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc
index 620f34e..4a5a14f 100644
--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc
@@ -110,7 +110,7 @@
// Refresh and block until dialog WebContents has been destroyed.
content::WebContentsDestroyedWatcher dialog_watcher(media_router_dialog_);
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
dialog_watcher.Wait();
}
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index 1c3e48b..bbbbed1 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -228,9 +228,7 @@
ASSERT_TRUE(list_value->GetString(0, &url));
LOG(WARNING) << "url: [" << url << "]";
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(url),
- NEW_BACKGROUND_TAB,
+ browser(), GURL(url), WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
}
@@ -241,9 +239,7 @@
GURL loader_url =
net_internals_test_->CreatePrerenderLoaderUrl(GURL(prerender_url));
ui_test_utils::NavigateToURLWithDisposition(
- browser(),
- GURL(loader_url),
- NEW_BACKGROUND_TAB,
+ browser(), GURL(loader_url), WindowOpenDisposition::NEW_BACKGROUND_TAB,
ui_test_utils::BROWSER_TEST_NONE);
}
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 4301948..e9c278c 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -502,8 +502,9 @@
Profile* profile = extension_service_->profile();
- WindowOpenDisposition disposition = args->GetSize() > 3 ?
- webui::GetDispositionFromClick(args, 3) : CURRENT_TAB;
+ WindowOpenDisposition disposition =
+ args->GetSize() > 3 ? webui::GetDispositionFromClick(args, 3)
+ : WindowOpenDisposition::CURRENT_TAB;
if (extension_id != extensions::kWebStoreAppId) {
CHECK_NE(launch_bucket, extension_misc::APP_LAUNCH_BUCKET_INVALID);
extensions::RecordAppLaunchType(launch_bucket, extension->GetType());
@@ -511,11 +512,12 @@
extensions::RecordWebStoreLaunch();
}
- if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB ||
- disposition == NEW_WINDOW) {
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB ||
+ disposition == WindowOpenDisposition::NEW_WINDOW) {
// TODO(jamescook): Proper support for background tabs.
AppLaunchParams params(profile, extension,
- disposition == NEW_WINDOW
+ disposition == WindowOpenDisposition::NEW_WINDOW
? extensions::LAUNCH_CONTAINER_WINDOW
: extensions::LAUNCH_CONTAINER_TAB,
disposition, extensions::SOURCE_NEW_TAB_PAGE);
@@ -531,7 +533,9 @@
old_contents = browser->tab_strip_model()->GetActiveWebContents();
AppLaunchParams params = CreateAppLaunchParamsUserContainer(
- profile, extension, old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB,
+ profile, extension,
+ old_contents ? WindowOpenDisposition::CURRENT_TAB
+ : WindowOpenDisposition::NEW_FOREGROUND_TAB,
extensions::SOURCE_NEW_TAB_PAGE);
params.override_url = GURL(url);
WebContents* new_contents = OpenApplication(params);
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index 8ffe5a7..0e019c9 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -78,18 +78,20 @@
// Navigate to chrome://hang/ to stall the process.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(content::kChromeUIHangURL), CURRENT_TAB, 0);
+ browser(), GURL(content::kChromeUIHangURL),
+ WindowOpenDisposition::CURRENT_TAB, 0);
// Visit a normal URL in another NTP that hasn't committed.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL(chrome::kChromeUINewTabURL), NEW_FOREGROUND_TAB, 0);
+ browser(), GURL(chrome::kChromeUINewTabURL),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB, 0);
// We don't use ui_test_utils::NavigateToURLWithDisposition because that waits
// for current loading to stop.
content::TestNavigationObserver observer(
browser()->tab_strip_model()->GetActiveWebContents());
browser()->OpenURL(OpenURLParams(
- GURL("data:text/html,hello world"), Referrer(), CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
+ GURL("data:text/html,hello world"), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
observer.Wait();
}
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 506fba8..793d38b 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -1712,9 +1712,9 @@
const base::ListValue* args) {
content::RecordAction(UserMetricsAction("Options_CloudPrintDevicesPage"));
// Navigate in current tab to devices page.
- OpenURLParams params(
- GURL(chrome::kChromeUIDevicesURL), Referrer(),
- CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false);
+ OpenURLParams params(GURL(chrome::kChromeUIDevicesURL), Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
web_ui()->GetWebContents()->OpenURL(params);
}
diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
index f4a0a63..fe9b813 100644
--- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
@@ -244,11 +244,9 @@
Browser* browser = chrome::FindBrowserWithWebContents(
web_ui()->GetWebContents());
- content::OpenURLParams params(ime->options_page_url(),
- content::Referrer(),
- SINGLETON_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::OpenURLParams params(ime->options_page_url(), content::Referrer(),
+ WindowOpenDisposition::SINGLETON_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
browser->OpenURL(params);
}
diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
index 71632726..4f1c2a2 100644
--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
@@ -359,7 +359,7 @@
// Set the secondary user's preference to true, and reload the primary user's
// browser to see the updated controlled-by indicator.
prefs2->SetBoolean(prefs::kEnableAutoScreenLock, true);
- chrome::Reload(browser, CURRENT_TAB);
+ chrome::Reload(browser, WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(contents);
{
SCOPED_TRACE("Screen lock false for primary user");
@@ -440,7 +440,7 @@
// Set the preference to false for the primary user and check that the
// indicator disappears.
prefs1->SetBoolean(prefs::kEnableAutoScreenLock, false);
- chrome::Reload(browser, CURRENT_TAB);
+ chrome::Reload(browser, WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(contents);
{
SCOPED_TRACE("Screen lock false for both users");
diff --git a/chrome/browser/ui/webui/options/options_ui_browsertest.cc b/chrome/browser/ui/webui/options/options_ui_browsertest.cc
index 7bf85275..255cc61f 100644
--- a/chrome/browser/ui/webui/options/options_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/options/options_ui_browsertest.cc
@@ -114,7 +114,8 @@
void OptionsUIBrowserTest::NavigateToSettingsSubpage(
const std::string& sub_page) {
const GURL& url = chrome::GetSettingsUrl(sub_page);
- ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), url, WindowOpenDisposition::CURRENT_TAB, 0);
content::WebContents* web_contents =
browser()->tab_strip_model()->GetActiveWebContents();
@@ -299,7 +300,7 @@
// Go back to the settings page.
content::TestNavigationObserver observer(contents);
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
observer.Wait();
// Verify that the settings page lists one profile.
diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
index a5b3c0b..a2d08b5e 100644
--- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc
@@ -43,7 +43,7 @@
void PasswordManagerInternalsWebUIBrowserTest::SetUpOnMainThread() {
WebUIBrowserTest::SetUpOnMainThread();
- OpenInternalsPage(CURRENT_TAB);
+ OpenInternalsPage(WindowOpenDisposition::CURRENT_TAB);
AddLibrary(base::FilePath(
FILE_PATH_LITERAL("password_manager_internals_browsertest.js")));
}
@@ -100,7 +100,7 @@
GetForBrowserContext(browser()->profile());
ASSERT_TRUE(service);
service->ProcessLog("<script> text for testing");
- OpenInternalsPage(CURRENT_TAB); // Reload.
+ OpenInternalsPage(WindowOpenDisposition::CURRENT_TAB); // Reload.
ASSERT_TRUE(RunJavascriptTest("testLogEmpty"));
}
@@ -119,7 +119,7 @@
service->ProcessLog("<script> text for testing");
ASSERT_TRUE(RunJavascriptTest("testLogText"));
// Now open a second tab with the internals page, but do not log anything.
- OpenInternalsPage(NEW_FOREGROUND_TAB);
+ OpenInternalsPage(WindowOpenDisposition::NEW_FOREGROUND_TAB);
// The previously logged text should have made it to the page.
ASSERT_TRUE(RunJavascriptTest("testLogText"));
}
@@ -129,7 +129,7 @@
IN_PROC_BROWSER_TEST_F(PasswordManagerInternalsWebUIBrowserTest,
LogSavePasswordProgress_NotFlushedOnReloadIfMultiple) {
// Open one more tab with the internals page.
- OpenInternalsPage(NEW_FOREGROUND_TAB);
+ OpenInternalsPage(WindowOpenDisposition::NEW_FOREGROUND_TAB);
// Now log something.
password_manager::PasswordManagerInternalsService* service =
password_manager::PasswordManagerInternalsServiceFactory::
@@ -137,7 +137,7 @@
ASSERT_TRUE(service);
service->ProcessLog("<script> text for testing");
// Reload.
- OpenInternalsPage(CURRENT_TAB);
+ OpenInternalsPage(WindowOpenDisposition::CURRENT_TAB);
// The text should still be there.
ASSERT_TRUE(RunJavascriptTest("testLogText"));
}
@@ -171,7 +171,7 @@
password_manager::PasswordManagerInternalsServiceFactory::
GetForBrowserContext(incognito->profile()->GetOffTheRecordProfile());
EXPECT_FALSE(service); // There should be no service for Incognito.
- OpenInternalsPageWithBrowser(incognito, CURRENT_TAB);
+ OpenInternalsPageWithBrowser(incognito, WindowOpenDisposition::CURRENT_TAB);
SetWebUIInstance(
incognito->tab_strip_model()->GetActiveWebContents()->GetWebUI());
ASSERT_TRUE(RunJavascriptTest("testIncognitoDescription"));
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index fa395cf..81b89e7 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -1138,12 +1138,10 @@
return;
if (!user.empty())
manage_url = net::AppendQueryParameter(manage_url, "user", user);
- preview_web_contents()->OpenURL(content::OpenURLParams(
- manage_url,
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ preview_web_contents()->OpenURL(
+ content::OpenURLParams(manage_url, content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
}
#if defined(ENABLE_BASIC_PRINTING)
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index a7006b8..e2bbe87 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -75,7 +75,7 @@
content::TestNavigationObserver reload_observer(
browser()->tab_strip_model()->GetActiveWebContents());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
reload_observer.Wait();
ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_PRINT));
@@ -129,7 +129,7 @@
Print();
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
+ browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
browser()->tab_strip_model()->ActivateTabAt(0, true);
diff --git a/chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc b/chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc
index 62f74f1e..8ab348e 100644
--- a/chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc
@@ -42,7 +42,7 @@
NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
WaitForLoadStop(browser()->tab_strip_model()->GetActiveWebContents());
}
diff --git a/chrome/browser/ui/webui/settings_utils_linux.cc b/chrome/browser/ui/webui/settings_utils_linux.cc
index be8768d..ed075c2 100644
--- a/chrome/browser/ui/webui/settings_utils_linux.cc
+++ b/chrome/browser/ui/webui/settings_utils_linux.cc
@@ -48,9 +48,9 @@
const char* name = base::nix::GetDesktopEnvironmentName(env.get());
if (name)
LOG(ERROR) << "Could not find " << name << " network settings in $PATH";
- OpenURLParams params(
- GURL(kLinuxProxyConfigUrl), Referrer(), NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK, false);
+ OpenURLParams params(GURL(kLinuxProxyConfigUrl), Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents =
tab_util::GetWebContentsByID(render_process_id, render_view_id);
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
index e0a7875..bbd6b50 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -97,11 +97,9 @@
signin_metrics::AccessPoint::ACCESS_POINT_APPS_PAGE_LINK
? chrome::kChromeUIAppsURL
: chrome::kChromeUINewTabURL);
- content::OpenURLParams params(url,
- content::Referrer(),
- CURRENT_TAB,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false);
+ content::OpenURLParams params(url, content::Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false);
contents->OpenURL(params);
}
@@ -219,10 +217,8 @@
void ConfirmEmailDialogDelegate::OnLinkClicked(
WindowOpenDisposition disposition) {
content::OpenURLParams params(
- GURL(chrome::kChromeSyncMergeTroubleshootingURL),
- content::Referrer(),
- NEW_POPUP,
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
+ GURL(chrome::kChromeSyncMergeTroubleshootingURL), content::Referrer(),
+ WindowOpenDisposition::NEW_POPUP, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
false);
// It is guaranteed that |web_contents_| is valid here because when it's
// deleted, the dialog is immediately closed and no further action can be
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 0cd5e10..2cb317b 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -310,8 +310,8 @@
#define MAYBE_DifferentStorageId DifferentStorageId
#endif
IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
- ContentInfo info =
- NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
+ ContentInfo info = NavigateAndGetInfo(browser(), GetSigninPromoURL(),
+ WindowOpenDisposition::CURRENT_TAB);
WaitUntilUIReady(browser());
// Make sure storage partition of embedded webview is different from
@@ -340,12 +340,12 @@
// still be given its own process and storage partition.
content::RenderProcessHost::SetMaxRendererProcessCount(1);
- ContentInfo info1 =
- NavigateAndGetInfo(browser(), test_url_1, CURRENT_TAB);
- ContentInfo info2 =
- NavigateAndGetInfo(browser(), test_url_2, CURRENT_TAB);
- ContentInfo info3 =
- NavigateAndGetInfo(browser(), GetSigninPromoURL(), CURRENT_TAB);
+ ContentInfo info1 = NavigateAndGetInfo(browser(), test_url_1,
+ WindowOpenDisposition::CURRENT_TAB);
+ ContentInfo info2 = NavigateAndGetInfo(browser(), test_url_2,
+ WindowOpenDisposition::CURRENT_TAB);
+ ContentInfo info3 = NavigateAndGetInfo(browser(), GetSigninPromoURL(),
+ WindowOpenDisposition::CURRENT_TAB);
ASSERT_EQ(info1.pid, info2.pid);
ASSERT_NE(info1.pid, info3.pid);
diff --git a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
index b2dc9716..ae5ea84 100644
--- a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
+++ b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
@@ -232,10 +232,8 @@
// we use NEW_FOREGROUND_TAB rather than the CURRENT_TAB used by default in
// ui_test_utils::NavigateToURL().
ui_test_utils::NavigateToURLWithDisposition(
- browser,
- signin_url,
- NEW_FOREGROUND_TAB,
- ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ browser, signin_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
DVLOG(1) << "Wait for login UI to be ready.";
WaitUntilUIReady(browser);
diff --git a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
index 7239b55..d87cdb2 100644
--- a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
+++ b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
@@ -102,11 +102,9 @@
std::string url;
bool success = args->GetString(0, &url);
DCHECK(success);
- content::OpenURLParams params(GURL(url),
- content::Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false);
+ content::OpenURLParams params(GURL(url), content::Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false);
// ProfileManager::GetLastUsedProfile() will attempt to load the default
// profile if there is no last used profile. If the default profile is not
// fully loaded and initialized, it will attempt to do so synchronously.
diff --git a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
index 32fd27f0d..e419d3a 100644
--- a/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
+++ b/chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc
@@ -80,12 +80,9 @@
TEST_F(WebDialogWebContentsDelegateTest, OpenURLFromTabTest) {
test_web_contents_delegate_->OpenURLFromTab(
- NULL,
- OpenURLParams(GURL(url::kAboutBlankURL),
- Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
+ NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
// This should create a new foreground tab in the existing browser.
EXPECT_EQ(1, browser()->tab_strip_model()->count());
EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
@@ -95,7 +92,8 @@
WebContents* contents =
WebContentsTester::CreateTestWebContents(profile(), NULL);
test_web_contents_delegate_->AddNewContents(
- NULL, contents, NEW_FOREGROUND_TAB, gfx::Rect(), false, NULL);
+ NULL, contents, WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect(),
+ false, NULL);
// This should create a new foreground tab in the existing browser.
EXPECT_EQ(1, browser()->tab_strip_model()->count());
EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
@@ -107,14 +105,12 @@
EXPECT_EQ(NULL, test_web_contents_delegate_->browser_context());
// Now, none of the following calls should do anything.
test_web_contents_delegate_->OpenURLFromTab(
- NULL,
- OpenURLParams(GURL(url::kAboutBlankURL),
- Referrer(),
- NEW_FOREGROUND_TAB,
- ui::PAGE_TRANSITION_LINK,
- false));
- test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
- gfx::Rect(), false, NULL);
+ NULL, OpenURLParams(GURL(url::kAboutBlankURL), Referrer(),
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_LINK, false));
+ test_web_contents_delegate_->AddNewContents(
+ NULL, NULL, WindowOpenDisposition::NEW_FOREGROUND_TAB, gfx::Rect(), false,
+ NULL);
EXPECT_EQ(0, browser()->tab_strip_model()->count());
EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
}
diff --git a/chrome/browser/ui/webui/webui_browsertest.cc b/chrome/browser/ui/webui/webui_browsertest.cc
index df3a881d..662e6ce 100644
--- a/chrome/browser/ui/webui/webui_browsertest.cc
+++ b/chrome/browser/ui/webui/webui_browsertest.cc
@@ -78,14 +78,14 @@
ASSERT_TRUE(content::ExecuteScript(
browser()->tab_strip_model()->GetActiveWebContents(),
"window.history.pushState({}, '', 'foo.html')"));
- chrome::GoBack(browser(), CURRENT_TAB);
+ chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
// Test handler should still have JavaScript allowed after in-page navigation.
EXPECT_TRUE(test_handler->IsJavascriptAllowed());
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
index 6d5f9938..d0d8ea3 100644
--- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
@@ -180,7 +180,7 @@
ASSERT_TRUE(tab_strip);
ui_test_utils::NavigateToURLWithDisposition(
- browser(), url, NEW_FOREGROUND_TAB,
+ browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
{
content::WebContents* web_contents = tab_strip->GetActiveWebContents();
@@ -286,7 +286,7 @@
// signin page, the HostZoomMap changes, and we need to test that the
// ZoomController correctly detects this.
ui_test_utils::NavigateToURLWithDisposition(
- browser(), signin_url, NEW_FOREGROUND_TAB,
+ browser(), signin_url, WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
login_ui_test_utils::WaitUntilUIReady(browser());
content::WebContents* web_contents =
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc
index a2d1b00..60b291c 100644
--- a/chrome/browser/unload_browsertest.cc
+++ b/chrome/browser/unload_browsertest.cc
@@ -153,7 +153,8 @@
// page without waiting for the first load to complete.
void NavigateToNolistenersFileTwiceAsync() {
GURL url(net::URLRequestMockHTTPJob::GetMockUrl("title2.html"));
- ui_test_utils::NavigateToURLWithDisposition(browser(), url, CURRENT_TAB, 0);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), url, WindowOpenDisposition::CURRENT_TAB, 0);
ui_test_utils::NavigateToURL(browser(), url);
CheckTitle("Title Of Awesomeness");
}
@@ -438,7 +439,7 @@
void NavigateToPageInNewTab(const char* name) {
ui_test_utils::NavigateToURLWithDisposition(
- browser(), GetUrl(name), NEW_FOREGROUND_TAB,
+ browser(), GetUrl(name), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
CheckTitle(name);
}
diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc
index 8833d72..7b2c6d3a 100644
--- a/chrome/browser/usb/usb_chooser_controller.cc
+++ b/chrome/browser/usb/usb_chooser_controller.cc
@@ -139,8 +139,8 @@
void UsbChooserController::OpenHelpCenterUrl() const {
GetBrowser()->OpenURL(content::OpenURLParams(
GURL(chrome::kChooserUsbOverviewURL), content::Referrer(),
- NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
- false /* is_renderer_initialized */));
+ WindowOpenDisposition::NEW_FOREGROUND_TAB,
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initialized */));
}
void UsbChooserController::OnDeviceAdded(
diff --git a/chrome/browser/usb/web_usb_detector.cc b/chrome/browser/usb/web_usb_detector.cc
index 3687fdb3..a74e65c5 100644
--- a/chrome/browser/usb/web_usb_detector.cc
+++ b/chrome/browser/usb/web_usb_detector.cc
@@ -74,7 +74,7 @@
void OpenURL(const GURL& url) {
GetBrowser()->OpenURL(content::OpenURLParams(
- url, content::Referrer(), NEW_FOREGROUND_TAB,
+ url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initialized */));
}
diff --git a/chrome/browser/web_bluetooth_browsertest.cc b/chrome/browser/web_bluetooth_browsertest.cc
index 98feac5..5bbec68 100644
--- a/chrome/browser/web_bluetooth_browsertest.cc
+++ b/chrome/browser/web_bluetooth_browsertest.cc
@@ -78,7 +78,7 @@
crash_observer.Wait();
// Reload tab.
- chrome::Reload(browser(), CURRENT_TAB);
+ chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB);
content::WaitForLoadStop(
browser()->tab_strip_model()->GetActiveWebContents());
