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

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

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix weird formatting in recent_tabs_sub_menu_model.cc Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 70ebf8517042301aba02085c577e16e8ae7bf597..098307f2840896e7aafbc88ea0fea15b66bac963 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1049,7 +1049,7 @@ void Browser::ActiveTabChanged(WebContents* old_contents,
// 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)
@@ -1404,10 +1404,10 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
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)) {
@@ -1978,8 +1978,8 @@ void Browser::FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info,
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));
}
///////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698