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

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

Issue 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Kept same error checking behavior for aw_contents.cc Created 5 years, 11 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 bool animate); 96 bool animate);
97 void ShowImeIfNeeded(JNIEnv* env, jobject obj); 97 void ShowImeIfNeeded(JNIEnv* env, jobject obj);
98 void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj); 98 void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);
99 void SelectWordAroundCaret(JNIEnv* env, jobject obj); 99 void SelectWordAroundCaret(JNIEnv* env, jobject obj);
100 100
101 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss); 101 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss);
102 void EvaluateJavaScript(JNIEnv* env, 102 void EvaluateJavaScript(JNIEnv* env,
103 jobject obj, 103 jobject obj,
104 jstring script, 104 jstring script,
105 jobject callback); 105 jobject callback);
106
michaelbai 2015/01/21 20:26:39 Did you intent to add a empty line here?
David Trainor- moved to gerrit 2015/01/21 23:13:25 I didn't. My bad.
106 private: 107 private:
107 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid(); 108 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
108 109
109 WebContents* web_contents_; 110 WebContents* web_contents_;
110 NavigationControllerAndroid navigation_controller_; 111 NavigationControllerAndroid navigation_controller_;
111 base::android::ScopedJavaGlobalRef<jobject> obj_; 112 base::android::ScopedJavaGlobalRef<jobject> obj_;
112 113
113 base::WeakPtrFactory<WebContentsAndroid> weak_factory_; 114 base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
114 115
115 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 116 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
116 }; 117 };
117 118
118 } // namespace content 119 } // namespace content
119 120
120 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 121 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698