Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 void ShowImeIfNeeded(JNIEnv* env, jobject obj); | 197 void ShowImeIfNeeded(JNIEnv* env, jobject obj); |
| 198 | 198 |
| 199 void ShowInterstitialPage(JNIEnv* env, | 199 void ShowInterstitialPage(JNIEnv* env, |
| 200 jobject obj, | 200 jobject obj, |
| 201 jstring jurl, | 201 jstring jurl, |
| 202 jint delegate); | 202 jint delegate); |
| 203 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj); | 203 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj); |
| 204 | 204 |
| 205 jboolean ConsumePendingRendererFrame(JNIEnv* env, jobject obj); | 205 jboolean ConsumePendingRendererFrame(JNIEnv* env, jobject obj); |
| 206 | 206 |
| 207 void ExternalVideoSurfaceCreated(JNIEnv* env, jobject obj, jobject jsurface); | |
| 208 void ExternalVideoSurfaceDestroyed(JNIEnv* env, jobject obj, | |
| 209 jobject jsurface); | |
|
no sievers
2013/03/05 19:54:16
Consider removing the unused arg 'jsurface' here.
wonsik
2013/03/06 02:48:20
Done.
| |
| 210 | |
| 207 // -------------------------------------------------------------------------- | 211 // -------------------------------------------------------------------------- |
| 208 // Public methods that call to Java via JNI | 212 // Public methods that call to Java via JNI |
| 209 // -------------------------------------------------------------------------- | 213 // -------------------------------------------------------------------------- |
| 210 | 214 |
| 211 // Creates a popup menu with |items|. | 215 // Creates a popup menu with |items|. |
| 212 // |multiple| defines if it should support multi-select. | 216 // |multiple| defines if it should support multi-select. |
| 213 // If not |multiple|, |selected_item| sets the initially selected item. | 217 // If not |multiple|, |selected_item| sets the initially selected item. |
| 214 // Otherwise, item's "checked" flag selects it. | 218 // Otherwise, item's "checked" flag selects it. |
| 215 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items, | 219 void ShowSelectPopupMenu(const std::vector<WebMenuItem>& items, |
| 216 int selected_item, | 220 int selected_item, |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 330 ui::WindowAndroid* window_android_; | 334 ui::WindowAndroid* window_android_; |
| 331 | 335 |
| 332 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); | 336 DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl); |
| 333 }; | 337 }; |
| 334 | 338 |
| 335 bool RegisterContentViewCore(JNIEnv* env); | 339 bool RegisterContentViewCore(JNIEnv* env); |
| 336 | 340 |
| 337 } // namespace content | 341 } // namespace content |
| 338 | 342 |
| 339 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ | 343 #endif // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_ |
| OLD | NEW |