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

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

Issue 570783002: Fix but that ignored startRenderer in WebContentsImpl.java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove startRenderer Created 6 years, 3 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 bool enable_showing, 81 bool enable_showing,
82 bool animate); 82 bool animate);
83 void ShowImeIfNeeded(JNIEnv* env, jobject obj); 83 void ShowImeIfNeeded(JNIEnv* env, jobject obj);
84 void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj); 84 void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);
85 void SelectWordAroundCaret(JNIEnv* env, jobject obj); 85 void SelectWordAroundCaret(JNIEnv* env, jobject obj);
86 86
87 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss); 87 void InsertCSS(JNIEnv* env, jobject jobj, jstring jcss);
88 void EvaluateJavaScript(JNIEnv* env, 88 void EvaluateJavaScript(JNIEnv* env,
89 jobject obj, 89 jobject obj,
90 jstring script, 90 jstring script,
91 jobject callback, 91 jobject callback);
92 jboolean start_renderer);
93 92
94 private: 93 private:
95 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid(); 94 RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid();
96 95
97 WebContents* web_contents_; 96 WebContents* web_contents_;
98 NavigationControllerAndroid navigation_controller_; 97 NavigationControllerAndroid navigation_controller_;
99 base::android::ScopedJavaGlobalRef<jobject> obj_; 98 base::android::ScopedJavaGlobalRef<jobject> obj_;
100 99
101 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 100 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
102 }; 101 };
103 102
104 } // namespace content 103 } // namespace content
105 104
106 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 105 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698