Index: components/web_contents_delegate_android/web_contents_delegate_android.cc |
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc |
index 61710e69475574f18c63175a494e75b33e7caab8..7d6c23a631d2039eff8a82c5f89a561326f22623 100644 |
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc |
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc |
@@ -69,10 +69,10 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab( |
const GURL& url = params.url; |
WindowOpenDisposition disposition = params.disposition; |
- if (!source || (disposition != CURRENT_TAB && |
- disposition != NEW_FOREGROUND_TAB && |
- disposition != NEW_BACKGROUND_TAB && |
- disposition != OFF_THE_RECORD)) { |
+ if (!source || (disposition != WindowOpenDisposition::CURRENT_TAB && |
+ disposition != WindowOpenDisposition::NEW_FOREGROUND_TAB && |
+ disposition != WindowOpenDisposition::NEW_BACKGROUND_TAB && |
+ disposition != WindowOpenDisposition::OFF_THE_RECORD)) { |
NOTIMPLEMENTED(); |
return NULL; |
} |
@@ -82,9 +82,9 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab( |
if (obj.is_null()) |
return WebContentsDelegate::OpenURLFromTab(source, params); |
- if (disposition == NEW_FOREGROUND_TAB || |
- disposition == NEW_BACKGROUND_TAB || |
- disposition == OFF_THE_RECORD) { |
+ if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB || |
+ disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB || |
+ disposition == WindowOpenDisposition::OFF_THE_RECORD) { |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jstring> java_url = |
ConvertUTF8ToJavaString(env, url.spec()); |
@@ -94,8 +94,8 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab( |
if (params.uses_post && params.post_data) |
post_data = params.post_data->ToJavaObject(env); |
Java_WebContentsDelegateAndroid_openNewTab( |
- env, obj, java_url, extra_headers, post_data, disposition, |
- params.is_renderer_initiated); |
+ env, obj, java_url, extra_headers, post_data, |
+ static_cast<int>(disposition), params.is_renderer_initiated); |
return NULL; |
} |