| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" | 5 #include "chrome/browser/media/android/router/media_router_dialog_controller_and
roid.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "chrome/browser/media/android/router/media_router_android.h" | 12 #include "chrome/browser/media/android/router/media_router_android.h" |
| 13 #include "chrome/browser/media/router/media_router.h" | 13 #include "chrome/browser/media/router/media_router.h" |
| 14 #include "chrome/browser/media/router/media_router_factory.h" | 14 #include "chrome/browser/media/router/media_router_factory.h" |
| 15 #include "chrome/browser/media/router/presentation_request.h" | 15 #include "chrome/browser/media/router/presentation_request.h" |
| 16 #include "chrome/browser/vr/vr_tab_helper.h" |
| 16 #include "chrome/common/media_router/media_source.h" | 17 #include "chrome/common/media_router/media_source.h" |
| 17 #include "content/public/browser/browser_context.h" | 18 #include "content/public/browser/browser_context.h" |
| 18 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 19 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 20 #include "content/public/browser/web_contents_delegate.h" | 21 #include "content/public/browser/web_contents_delegate.h" |
| 21 #include "device/vr/features/features.h" | 22 #include "device/vr/features/features.h" |
| 22 #include "jni/ChromeMediaRouterDialogController_jni.h" | 23 #include "jni/ChromeMediaRouterDialogController_jni.h" |
| 23 | 24 |
| 24 #if BUILDFLAG(ENABLE_VR) | |
| 25 #include "chrome/browser/android/vr_shell/vr_tab_helper.h" | |
| 26 #endif // BUILDFLAG(ENABLE_VR) | |
| 27 | |
| 28 DEFINE_WEB_CONTENTS_USER_DATA_KEY( | 25 DEFINE_WEB_CONTENTS_USER_DATA_KEY( |
| 29 media_router::MediaRouterDialogControllerAndroid); | 26 media_router::MediaRouterDialogControllerAndroid); |
| 30 | 27 |
| 31 using base::android::ConvertJavaStringToUTF8; | 28 using base::android::ConvertJavaStringToUTF8; |
| 32 using base::android::JavaParamRef; | 29 using base::android::JavaParamRef; |
| 33 using base::android::ScopedJavaLocalRef; | 30 using base::android::ScopedJavaLocalRef; |
| 34 using content::WebContents; | 31 using content::WebContents; |
| 35 | 32 |
| 36 namespace media_router { | 33 namespace media_router { |
| 37 | 34 |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 java_dialog_controller_); | 200 java_dialog_controller_); |
| 204 } | 201 } |
| 205 | 202 |
| 206 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { | 203 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { |
| 207 JNIEnv* env = base::android::AttachCurrentThread(); | 204 JNIEnv* env = base::android::AttachCurrentThread(); |
| 208 return Java_ChromeMediaRouterDialogController_isShowingDialog( | 205 return Java_ChromeMediaRouterDialogController_isShowingDialog( |
| 209 env, java_dialog_controller_); | 206 env, java_dialog_controller_); |
| 210 } | 207 } |
| 211 | 208 |
| 212 } // namespace media_router | 209 } // namespace media_router |
| OLD | NEW |