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

Side by Side Diff: content/browser/android/content_view_core_impl.h

Issue 10823340: [Android] Upstream Modal Dialogs functionality (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/android/content_view_core_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_helper.h" 10 #include "base/android/jni_helper.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 jboolean CanGoToOffset(JNIEnv* env, jobject obj, jint offset); 106 jboolean CanGoToOffset(JNIEnv* env, jobject obj, jint offset);
107 void GoBack(JNIEnv* env, jobject obj); 107 void GoBack(JNIEnv* env, jobject obj);
108 void GoForward(JNIEnv* env, jobject obj); 108 void GoForward(JNIEnv* env, jobject obj);
109 void GoToOffset(JNIEnv* env, jobject obj, jint offset); 109 void GoToOffset(JNIEnv* env, jobject obj, jint offset);
110 void StopLoading(JNIEnv* env, jobject obj); 110 void StopLoading(JNIEnv* env, jobject obj);
111 void Reload(JNIEnv* env, jobject obj); 111 void Reload(JNIEnv* env, jobject obj);
112 jboolean NeedsReload(JNIEnv* env, jobject obj); 112 jboolean NeedsReload(JNIEnv* env, jobject obj);
113 void ClearHistory(JNIEnv* env, jobject obj); 113 void ClearHistory(JNIEnv* env, jobject obj);
114 void SetClient(JNIEnv* env, jobject obj, jobject jclient); 114 void SetClient(JNIEnv* env, jobject obj, jobject jclient);
115 jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script); 115 jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script);
116 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() OVERRIDE;
116 void AddJavascriptInterface(JNIEnv* env, 117 void AddJavascriptInterface(JNIEnv* env,
117 jobject obj, 118 jobject obj,
118 jobject object, 119 jobject object,
119 jstring name, 120 jstring name,
120 jboolean require_annotation); 121 jboolean require_annotation);
121 void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name); 122 void RemoveJavascriptInterface(JNIEnv* env, jobject obj, jstring name);
122 int GetNavigationHistory(JNIEnv* env, jobject obj, jobject context); 123 int GetNavigationHistory(JNIEnv* env, jobject obj, jobject context);
123 124
124 // -------------------------------------------------------------------------- 125 // --------------------------------------------------------------------------
125 // Public methods that call to Java via JNI 126 // Public methods that call to Java via JNI
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 bool tab_crashed_; 206 bool tab_crashed_;
206 207
207 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); 208 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
208 }; 209 };
209 210
210 bool RegisterContentViewCore(JNIEnv* env); 211 bool RegisterContentViewCore(JNIEnv* env);
211 212
212 } // namespace content 213 } // namespace content
213 214
214 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ 215 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698