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

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

Issue 1131113004: Convert JsonWriter::Write to taking a const ref for the in-param (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another rebase Created 5 years, 7 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/tracing/tracing_ui.cc ('k') | content/browser/webui/web_ui_impl.cc » ('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_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/command_line.h" 10 #include "base/command_line.h"
(...skipping 28 matching lines...) Expand all
39 using base::android::ToJavaIntArray; 39 using base::android::ToJavaIntArray;
40 40
41 namespace content { 41 namespace content {
42 42
43 namespace { 43 namespace {
44 44
45 void JavaScriptResultCallback(const ScopedJavaGlobalRef<jobject>& callback, 45 void JavaScriptResultCallback(const ScopedJavaGlobalRef<jobject>& callback,
46 const base::Value* result) { 46 const base::Value* result) {
47 JNIEnv* env = base::android::AttachCurrentThread(); 47 JNIEnv* env = base::android::AttachCurrentThread();
48 std::string json; 48 std::string json;
49 base::JSONWriter::Write(result, &json); 49 base::JSONWriter::Write(*result, &json);
50 ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json); 50 ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json);
51 Java_WebContentsImpl_onEvaluateJavaScriptResult( 51 Java_WebContentsImpl_onEvaluateJavaScriptResult(
52 env, j_json.obj(), callback.obj()); 52 env, j_json.obj(), callback.obj());
53 } 53 }
54 54
55 ScopedJavaLocalRef<jobject> WalkAXTreeDepthFirst(JNIEnv* env, 55 ScopedJavaLocalRef<jobject> WalkAXTreeDepthFirst(JNIEnv* env,
56 BrowserAccessibilityAndroid* node) { 56 BrowserAccessibilityAndroid* node) {
57 57
58 ScopedJavaLocalRef<jstring> j_text = 58 ScopedJavaLocalRef<jstring> j_text =
59 ConvertUTF16ToJavaString(env, node->GetText()); 59 ConvertUTF16ToJavaString(env, node->GetText());
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 ScopedJavaGlobalRef<jobject> j_callback; 566 ScopedJavaGlobalRef<jobject> j_callback;
567 j_callback.Reset(env, callback); 567 j_callback.Reset(env, callback);
568 WebContentsImpl::AXTreeSnapshotCallback snapshot_callback = 568 WebContentsImpl::AXTreeSnapshotCallback snapshot_callback =
569 base::Bind(&AXTreeSnapshotCallback, j_callback); 569 base::Bind(&AXTreeSnapshotCallback, j_callback);
570 570
571 static_cast<WebContentsImpl*>(web_contents_)->RequestAXTreeSnapshot( 571 static_cast<WebContentsImpl*>(web_contents_)->RequestAXTreeSnapshot(
572 snapshot_callback); 572 snapshot_callback);
573 } 573 }
574 574
575 } // namespace content 575 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/tracing/tracing_ui.cc ('k') | content/browser/webui/web_ui_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698