Index: chrome/browser/android/tab_web_contents_delegate_android.cc |
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc |
index 41507a31a533cc2178acb2282db3421e912c79e7..fa9eb21539cf571dabad5d76f8cdce9df5465e02 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* TabWebContentsDelegateAndroid::OpenURLFromTab( |
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 @@ WebContents* TabWebContentsDelegateAndroid::OpenURLFromTab( |
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 @@ WebContents* TabWebContentsDelegateAndroid::OpenURLFromTab( |
} |
} |
- 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 @@ void TabWebContentsDelegateAndroid::AddNewContents( |
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); |