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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2889693005: Stay in VR while showing DOFF flow and connect CCT exit button to this. (Closed)
Patch Set: rebase Created 3 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 const base::android::JavaParamRef<jobject>& obj, 106 const base::android::JavaParamRef<jobject>& obj,
107 jboolean incognito, 107 jboolean incognito,
108 jint id, 108 jint id,
109 jstring jtitle); 109 jstring jtitle);
110 void OnTabRemoved(JNIEnv* env, 110 void OnTabRemoved(JNIEnv* env,
111 const base::android::JavaParamRef<jobject>& obj, 111 const base::android::JavaParamRef<jobject>& obj,
112 jboolean incognito, 112 jboolean incognito,
113 jint id); 113 jint id);
114 void OnContentPaused(bool paused); 114 void OnContentPaused(bool paused);
115 void NavigateBack(); 115 void NavigateBack();
116 void ExitCct();
116 base::android::ScopedJavaGlobalRef<jobject> TakeContentSurface( 117 base::android::ScopedJavaGlobalRef<jobject> TakeContentSurface(
117 JNIEnv* env, 118 JNIEnv* env,
118 const base::android::JavaParamRef<jobject>& obj); 119 const base::android::JavaParamRef<jobject>& obj);
119 void RestoreContentSurface(JNIEnv* env, 120 void RestoreContentSurface(JNIEnv* env,
120 const base::android::JavaParamRef<jobject>& obj); 121 const base::android::JavaParamRef<jobject>& obj);
121 void SetHistoryButtonsEnabled(JNIEnv* env, 122 void SetHistoryButtonsEnabled(JNIEnv* env,
122 const base::android::JavaParamRef<jobject>& obj, 123 const base::android::JavaParamRef<jobject>& obj,
123 jboolean can_go_back, 124 jboolean can_go_back,
124 jboolean can_go_forward); 125 jboolean can_go_forward);
125 126
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 241 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
241 242
242 DISALLOW_COPY_AND_ASSIGN(VrShell); 243 DISALLOW_COPY_AND_ASSIGN(VrShell);
243 }; 244 };
244 245
245 bool RegisterVrShell(JNIEnv* env); 246 bool RegisterVrShell(JNIEnv* env);
246 247
247 } // namespace vr_shell 248 } // namespace vr_shell
248 249
249 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 250 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_gl_thread.cc ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698