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

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

Issue 775843004: Navigation transitions (web to native app): Revert exit transition (Chrome side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years 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
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_android.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 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 void Stop(JNIEnv* env, jobject obj); 50 void Stop(JNIEnv* env, jobject obj);
51 jint GetBackgroundColor(JNIEnv* env, jobject obj); 51 jint GetBackgroundColor(JNIEnv* env, jobject obj);
52 base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const; 52 base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
53 jboolean IsIncognito(JNIEnv* env, jobject obj); 53 jboolean IsIncognito(JNIEnv* env, jobject obj);
54 54
55 void ResumeResponseDeferredAtStart(JNIEnv* env, jobject obj); 55 void ResumeResponseDeferredAtStart(JNIEnv* env, jobject obj);
56 void SetHasPendingNavigationTransitionForTesting(JNIEnv* env, jobject obj); 56 void SetHasPendingNavigationTransitionForTesting(JNIEnv* env, jobject obj);
57 void SetupTransitionView(JNIEnv* env, jobject jobj, jstring markup); 57 void SetupTransitionView(JNIEnv* env, jobject jobj, jstring markup);
58 void BeginExitTransition(JNIEnv* env, jobject jobj, jstring css_selector, 58 void BeginExitTransition(JNIEnv* env, jobject jobj, jstring css_selector,
59 jboolean exit_to_native_app); 59 jboolean exit_to_native_app);
60 void RevertExitTransition(JNIEnv* env, jobject jobj);
60 void HideTransitionElements(JNIEnv* env, jobject jobj, jstring css_selector); 61 void HideTransitionElements(JNIEnv* env, jobject jobj, jstring css_selector);
61 void ShowTransitionElements(JNIEnv* env, jobject jobj, jstring css_selector); 62 void ShowTransitionElements(JNIEnv* env, jobject jobj, jstring css_selector);
62 void ClearNavigationTransitionData(JNIEnv* env, jobject jobj); 63 void ClearNavigationTransitionData(JNIEnv* env, jobject jobj);
63 void FetchTransitionElements(JNIEnv* env, jobject jobj, jstring jurl); 64 void FetchTransitionElements(JNIEnv* env, jobject jobj, jstring jurl);
64 void OnTransitionElementsFetched( 65 void OnTransitionElementsFetched(
65 scoped_ptr<const TransitionLayerData> transition_data, 66 scoped_ptr<const TransitionLayerData> transition_data,
66 bool has_transition_data); 67 bool has_transition_data);
67 68
68 // This method is invoked when the request is deferred immediately after 69 // This method is invoked when the request is deferred immediately after
69 // receiving response headers. 70 // receiving response headers.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 base::android::ScopedJavaGlobalRef<jobject> obj_; 111 base::android::ScopedJavaGlobalRef<jobject> obj_;
111 112
112 base::WeakPtrFactory<WebContentsAndroid> weak_factory_; 113 base::WeakPtrFactory<WebContentsAndroid> weak_factory_;
113 114
114 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid); 115 DISALLOW_COPY_AND_ASSIGN(WebContentsAndroid);
115 }; 116 };
116 117
117 } // namespace content 118 } // namespace content
118 119
119 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_ 120 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698