OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/browser/web_contents/web_contents_android.h" | 5 #include "content/browser/web_contents/web_contents_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/json/json_writer.h" | |
10 #include "base/logging.h" | 11 #include "base/logging.h" |
11 #include "content/browser/android/interstitial_page_delegate_android.h" | 12 #include "content/browser/android/interstitial_page_delegate_android.h" |
12 #include "content/browser/frame_host/interstitial_page_impl.h" | 13 #include "content/browser/frame_host/interstitial_page_impl.h" |
13 #include "content/browser/media/media_web_contents_observer.h" | 14 #include "content/browser/media/media_web_contents_observer.h" |
14 #include "content/browser/renderer_host/render_view_host_impl.h" | 15 #include "content/browser/renderer_host/render_view_host_impl.h" |
15 #include "content/browser/web_contents/web_contents_impl.h" | 16 #include "content/browser/web_contents/web_contents_impl.h" |
16 #include "content/common/frame_messages.h" | 17 #include "content/common/frame_messages.h" |
17 #include "content/common/input_messages.h" | 18 #include "content/common/input_messages.h" |
18 #include "content/common/view_messages.h" | 19 #include "content/common/view_messages.h" |
19 #include "content/public/browser/browser_context.h" | 20 #include "content/public/browser/browser_context.h" |
20 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
21 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
22 #include "content/public/common/content_switches.h" | 23 #include "content/public/common/content_switches.h" |
23 #include "jni/WebContentsImpl_jni.h" | 24 #include "jni/WebContentsImpl_jni.h" |
24 | 25 |
25 using base::android::AttachCurrentThread; | 26 using base::android::AttachCurrentThread; |
26 using base::android::ConvertJavaStringToUTF8; | 27 using base::android::ConvertJavaStringToUTF8; |
28 using base::android::ConvertJavaStringToUTF16; | |
27 using base::android::ConvertUTF8ToJavaString; | 29 using base::android::ConvertUTF8ToJavaString; |
30 using base::android::ScopedJavaGlobalRef; | |
31 | |
32 namespace { | |
33 | |
34 void JavaScriptResultCallback(const ScopedJavaGlobalRef<jobject>& callback, | |
35 const base::Value* result) { | |
36 JNIEnv* env = base::android::AttachCurrentThread(); | |
37 std::string json; | |
38 base::JSONWriter::Write(result, &json); | |
39 ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json); | |
40 content::Java_WebContentsImpl_onEvaluateJavaScriptResult( | |
41 env, j_json.obj(), callback.obj()); | |
42 } | |
43 | |
44 } // namespace | |
28 | 45 |
29 namespace content { | 46 namespace content { |
30 | 47 |
31 // static | 48 // static |
32 WebContents* WebContents::FromJavaWebContents( | 49 WebContents* WebContents::FromJavaWebContents( |
33 jobject jweb_contents_android) { | 50 jobject jweb_contents_android) { |
34 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 51 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
35 if (!jweb_contents_android) | 52 if (!jweb_contents_android) |
36 return NULL; | 53 return NULL; |
37 | 54 |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
300 env, obj_.obj(), jstring_url.obj()); | 317 env, obj_.obj(), jstring_url.obj()); |
301 } | 318 } |
302 } | 319 } |
303 | 320 |
304 void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) { | 321 void WebContentsAndroid::DidStartNavigationTransitionForFrame(int64 frame_id) { |
305 JNIEnv* env = AttachCurrentThread(); | 322 JNIEnv* env = AttachCurrentThread(); |
306 Java_WebContentsImpl_didStartNavigationTransitionForFrame( | 323 Java_WebContentsImpl_didStartNavigationTransitionForFrame( |
307 env, obj_.obj(), frame_id); | 324 env, obj_.obj(), frame_id); |
308 } | 325 } |
309 | 326 |
327 void WebContentsAndroid::EvaluateJavaScript(JNIEnv* env, | |
328 jobject obj, | |
329 jstring script, | |
330 jobject callback, | |
331 jboolean start_renderer) { | |
332 RenderViewHost* rvh = web_contents_->GetRenderViewHost(); | |
333 DCHECK(rvh); | |
334 | |
335 if (start_renderer && !rvh->IsRenderViewLive()) { | |
336 if (!static_cast<WebContentsImpl*>(web_contents_) | |
337 ->CreateRenderViewForInitialEmptyDocument()) { | |
Ted C
2014/08/14 17:28:07
This indenting seems off, I think the -> should go
AKVT
2014/08/14 17:39:59
Done.
| |
338 LOG(ERROR) << "Failed to create RenderView in EvaluateJavaScript"; | |
339 return; | |
340 } | |
341 } | |
342 | |
343 if (!callback) { | |
344 // No callback requested. | |
345 web_contents_->GetMainFrame()->ExecuteJavaScript( | |
346 ConvertJavaStringToUTF16(env, script)); | |
347 return; | |
348 } | |
349 | |
350 // Secure the Java callback in a scoped object and give ownership of it to the | |
351 // base::Callback. | |
352 ScopedJavaGlobalRef<jobject> j_callback; | |
353 j_callback.Reset(env, callback); | |
354 content::RenderFrameHost::JavaScriptResultCallback c_callback = | |
355 base::Bind(&JavaScriptResultCallback, j_callback); | |
356 | |
357 web_contents_->GetMainFrame()->ExecuteJavaScript( | |
358 ConvertJavaStringToUTF16(env, script), c_callback); | |
Ted C
2014/08/14 17:28:07
The c_ prefix is not something I've seen before.
AKVT
2014/08/14 17:39:59
Done. Thanks
| |
359 } | |
360 | |
310 } // namespace content | 361 } // namespace content |
OLD | NEW |