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

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

Issue 689123003: Revert of Navigation transitions (web to native app): Pass data after starting provisional load ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 // This method is invoked when the request is deferred immediately after 59 // This method is invoked when the request is deferred immediately after
60 // receiving response headers. 60 // receiving response headers.
61 void DidDeferAfterResponseStarted(const TransitionLayerData& transition_data); 61 void DidDeferAfterResponseStarted(const TransitionLayerData& transition_data);
62 62
63 // This method is invoked when a navigation transition is detected, to 63 // This method is invoked when a navigation transition is detected, to
64 // determine if the embedder intends to handle it. 64 // determine if the embedder intends to handle it.
65 bool WillHandleDeferAfterResponseStarted(); 65 bool WillHandleDeferAfterResponseStarted();
66 66
67 // This method is invoked when a navigation transition has started. 67 // This method is invoked when a navigation transition has started.
68 void DidStartNavigationTransitionForFrame( 68 void DidStartNavigationTransitionForFrame(int64 frame_id);
69 int64 frame_id,
70 const TransitionLayerData& transition_data);
71 69
72 void OnHide(JNIEnv* env, jobject obj); 70 void OnHide(JNIEnv* env, jobject obj);
73 void OnShow(JNIEnv* env, jobject obj); 71 void OnShow(JNIEnv* env, jobject obj);
74 void ReleaseMediaPlayers(JNIEnv* env, jobject jobj); 72 void ReleaseMediaPlayers(JNIEnv* env, jobject jobj);
75 73
76 void AddStyleSheetByURL( 74 void AddStyleSheetByURL(
77 JNIEnv* env, jobject obj, jstring url); 75 JNIEnv* env, jobject obj, jstring url);
78 void ShowInterstitialPage( 76 void ShowInterstitialPage(
79 JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr); 77 JNIEnv* env, jobject obj, jstring jurl, jlong delegate_ptr);
80 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj); 78 jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
(...skipping 22 matching lines...) Expand all
103 WebContents* web_contents_; 101 WebContents* web_contents_;
104 NavigationControllerAndroid navigation_controller_; 102 NavigationControllerAndroid navigation_controller_;
105 base::android::ScopedJavaGlobalRef<jobject> obj_; 103 base::android::ScopedJavaGlobalRef<jobject> obj_;
106 104
107 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 105 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
108 }; 106 };
109 107
110 } // namespace content 108 } // namespace content
111 109
112 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 110 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/transition_request_manager.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698