Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Side by Side Diff: content/browser/web_contents/web_contents_android.cc

Issue 873133002: Add AddMessageToDevToolsConsole to WebContentsAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_android.h ('k') | content/content.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/json/json_writer.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "content/browser/android/interstitial_page_delegate_android.h" 12 #include "content/browser/android/interstitial_page_delegate_android.h"
13 #include "content/browser/frame_host/interstitial_page_impl.h" 13 #include "content/browser/frame_host/interstitial_page_impl.h"
14 #include "content/browser/media/android/browser_media_player_manager.h" 14 #include "content/browser/media/android/browser_media_player_manager.h"
15 #include "content/browser/media/media_web_contents_observer.h" 15 #include "content/browser/media/media_web_contents_observer.h"
16 #include "content/browser/renderer_host/render_view_host_impl.h" 16 #include "content/browser/renderer_host/render_view_host_impl.h"
17 #include "content/browser/web_contents/web_contents_impl.h" 17 #include "content/browser/web_contents/web_contents_impl.h"
18 #include "content/common/devtools_messages.h"
18 #include "content/common/frame_messages.h" 19 #include "content/common/frame_messages.h"
19 #include "content/common/input_messages.h" 20 #include "content/common/input_messages.h"
20 #include "content/common/view_messages.h" 21 #include "content/common/view_messages.h"
21 #include "content/public/browser/browser_context.h" 22 #include "content/public/browser/browser_context.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
24 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
25 #include "jni/WebContentsImpl_jni.h" 26 #include "jni/WebContentsImpl_jni.h"
26 27
27 using base::android::AttachCurrentThread; 28 using base::android::AttachCurrentThread;
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 // base::Callback. 444 // base::Callback.
444 ScopedJavaGlobalRef<jobject> j_callback; 445 ScopedJavaGlobalRef<jobject> j_callback;
445 j_callback.Reset(env, callback); 446 j_callback.Reset(env, callback);
446 content::RenderFrameHost::JavaScriptResultCallback js_callback = 447 content::RenderFrameHost::JavaScriptResultCallback js_callback =
447 base::Bind(&JavaScriptResultCallback, j_callback); 448 base::Bind(&JavaScriptResultCallback, j_callback);
448 449
449 web_contents_->GetMainFrame()->ExecuteJavaScript( 450 web_contents_->GetMainFrame()->ExecuteJavaScript(
450 ConvertJavaStringToUTF16(env, script), js_callback); 451 ConvertJavaStringToUTF16(env, script), js_callback);
451 } 452 }
452 453
454 void WebContentsAndroid::AddMessageToDevToolsConsole(JNIEnv* env,
455 jobject jobj,
456 jint level,
457 jstring message) {
458 DCHECK_GE(level, 0);
459 DCHECK_LE(level, CONSOLE_MESSAGE_LEVEL_LAST);
460
461 web_contents_->GetMainFrame()->Send(new DevToolsAgentMsg_AddMessageToConsole(
462 web_contents_->GetMainFrame()->GetRoutingID(),
463 static_cast<ConsoleMessageLevel>(level),
464 ConvertJavaStringToUTF8(env, message)));
465 }
466
453 } // namespace content 467 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_android.h ('k') | content/content.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698