OLD | NEW |
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 | 53 |
54 // This method is invoked when the request is deferred immediately after | 54 // This method is invoked when the request is deferred immediately after |
55 // receiving response headers. | 55 // receiving response headers. |
56 void DidDeferAfterResponseStarted(const TransitionLayerData& transition_data); | 56 void DidDeferAfterResponseStarted(const TransitionLayerData& transition_data); |
57 | 57 |
58 // This method is invoked when a navigation transition is detected, to | 58 // This method is invoked when a navigation transition is detected, to |
59 // determine if the embedder intends to handle it. | 59 // determine if the embedder intends to handle it. |
60 bool WillHandleDeferAfterResponseStarted(); | 60 bool WillHandleDeferAfterResponseStarted(); |
61 | 61 |
62 // This method is invoked when a navigation transition has started. | 62 // This method is invoked when a navigation transition has started. |
63 void DidStartNavigationTransitionForFrame(int64 frame_id); | 63 void DidStartNavigationTransitionForFrame( |
| 64 int64 frame_id, |
| 65 const TransitionLayerData& transition_data); |
64 | 66 |
65 void OnHide(JNIEnv* env, jobject obj); | 67 void OnHide(JNIEnv* env, jobject obj); |
66 void OnShow(JNIEnv* env, jobject obj); | 68 void OnShow(JNIEnv* env, jobject obj); |
67 void ReleaseMediaPlayers(JNIEnv* env, jobject jobj); | 69 void ReleaseMediaPlayers(JNIEnv* env, jobject jobj); |
68 | 70 |
69 void AddStyleSheetByURL( | 71 void AddStyleSheetByURL( |
70 JNIEnv* env, jobject obj, jstring url); | 72 JNIEnv* env, jobject obj, jstring url); |
71 void ShowInterstitialPage( | 73 void ShowInterstitialPage( |
72 JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr); | 74 JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr); |
73 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj); | 75 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj); |
(...skipping 21 matching lines...) Expand all Loading... |
95 WebContents* web_contents_; | 97 WebContents* web_contents_; |
96 NavigationControllerAndroid navigation_controller_; | 98 NavigationControllerAndroid navigation_controller_; |
97 base::android::ScopedJavaGlobalRef<jobject> obj_; | 99 base::android::ScopedJavaGlobalRef<jobject> obj_; |
98 | 100 |
99 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); | 101 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); |
100 }; | 102 }; |
101 | 103 |
102 } // namespace content | 104 } // namespace content |
103 | 105 |
104 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ | 106 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ |
OLD | NEW |