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/context_utils.h" |
7 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
9 #include "chrome/browser/media/android/router/media_router_android.h" | 10 #include "chrome/browser/media/android/router/media_router_android.h" |
10 #include "chrome/browser/media/router/media_router.h" | 11 #include "chrome/browser/media/router/media_router.h" |
11 #include "chrome/browser/media/router/media_router_factory.h" | 12 #include "chrome/browser/media/router/media_router_factory.h" |
12 #include "chrome/browser/media/router/media_source.h" | 13 #include "chrome/browser/media/router/media_source.h" |
13 #include "chrome/browser/media/router/presentation_request.h" | 14 #include "chrome/browser/media/router/presentation_request.h" |
14 #include "content/public/browser/browser_context.h" | 15 #include "content/public/browser/browser_context.h" |
15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 request->InvokeErrorCallback(content::PresentationError( | 97 request->InvokeErrorCallback(content::PresentationError( |
97 content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED, | 98 content::PRESENTATION_ERROR_PRESENTATION_REQUEST_CANCELLED, |
98 "Dialog closed.")); | 99 "Dialog closed.")); |
99 } | 100 } |
100 | 101 |
101 MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid( | 102 MediaRouterDialogControllerAndroid::MediaRouterDialogControllerAndroid( |
102 WebContents* web_contents) | 103 WebContents* web_contents) |
103 : MediaRouterDialogController(web_contents) { | 104 : MediaRouterDialogController(web_contents) { |
104 JNIEnv* env = base::android::AttachCurrentThread(); | 105 JNIEnv* env = base::android::AttachCurrentThread(); |
105 java_dialog_controller_.Reset(Java_ChromeMediaRouterDialogController_create( | 106 java_dialog_controller_.Reset(Java_ChromeMediaRouterDialogController_create( |
106 env, reinterpret_cast<jlong>(this))); | 107 env, |
| 108 reinterpret_cast<jlong>(this), |
| 109 base::android::GetApplicationContext())); |
107 } | 110 } |
108 | 111 |
109 // static | 112 // static |
110 bool MediaRouterDialogControllerAndroid::Register(JNIEnv* env) { | 113 bool MediaRouterDialogControllerAndroid::Register(JNIEnv* env) { |
111 return RegisterNativesImpl(env); | 114 return RegisterNativesImpl(env); |
112 } | 115 } |
113 | 116 |
114 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() { | 117 MediaRouterDialogControllerAndroid::~MediaRouterDialogControllerAndroid() { |
115 } | 118 } |
116 | 119 |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 } | 159 } |
157 | 160 |
158 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { | 161 bool MediaRouterDialogControllerAndroid::IsShowingMediaRouterDialog() const { |
159 JNIEnv* env = base::android::AttachCurrentThread(); | 162 JNIEnv* env = base::android::AttachCurrentThread(); |
160 return Java_ChromeMediaRouterDialogController_isShowingDialog( | 163 return Java_ChromeMediaRouterDialogController_isShowingDialog( |
161 env, java_dialog_controller_); | 164 env, java_dialog_controller_); |
162 } | 165 } |
163 | 166 |
164 } // namespace media_router | 167 } // namespace media_router |
165 | 168 |
OLD | NEW |