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

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

Issue 1257603003: Revert of Add ExecuteJavaScriptForTest and make all tests use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void SelectWordAroundCaret(JNIEnv* env, jobject obj); 79 void SelectWordAroundCaret(JNIEnv* env, jobject obj);
80 void AdjustSelectionByCharacterOffset(JNIEnv* env, 80 void AdjustSelectionByCharacterOffset(JNIEnv* env,
81 jobject obj, 81 jobject obj,
82 jint start_adjust, 82 jint start_adjust,
83 jint end_adjust); 83 jint end_adjust);
84 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss); 84 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss);
85 void EvaluateJavaScript(JNIEnv* env, 85 void EvaluateJavaScript(JNIEnv* env,
86 jobject obj, 86 jobject obj,
87 jstring script, 87 jstring script,
88 jobject callback); 88 jobject callback);
89 void EvaluateJavaScriptForTests(JNIEnv* env,
90 jobject obj,
91 jstring script,
92 jobject callback);
93 89
94 void AddMessageToDevToolsConsole(JNIEnv* env, 90 void AddMessageToDevToolsConsole(JNIEnv* env,
95 jobject jobj, 91 jobject jobj,
96 jint level, 92 jint level,
97 jstring message); 93 jstring message);
98 94
99 jboolean HasAccessedInitialDocument(JNIEnv* env, jobject jobj); 95 jboolean HasAccessedInitialDocument(JNIEnv* env, jobject jobj);
100 96
101 jint GetThemeColor(JNIEnv* env, jobject obj); 97 jint GetThemeColor(JNIEnv* env, jobject obj);
102 98
(...skipping 14 matching lines...) Expand all
117 base::android::ScopedJavaGlobalRef<jobject> obj_; 113 base::android::ScopedJavaGlobalRef<jobject> obj_;
118 114
119 base::WeakPtrFactory<WebContentsAndroid> weak_factory_; 115 base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
120 116
121 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 117 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
122 }; 118 };
123 119
124 } // namespace content 120 } // namespace content
125 121
126 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 122 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698