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

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

Issue 2874103003: Revert of App button click exits WebVR presentation. (Closed)
Patch Set: 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 // Perform a UI action triggered by the javascript API. 142 // Perform a UI action triggered by the javascript API.
143 void DoUiAction(const UiAction action, 143 void DoUiAction(const UiAction action,
144 const base::DictionaryValue* arguments); 144 const base::DictionaryValue* arguments);
145 145
146 void SetContentCssSize(float width, float height, float dpr); 146 void SetContentCssSize(float width, float height, float dpr);
147 147
148 void ContentFrameWasResized(bool width_changed); 148 void ContentFrameWasResized(bool width_changed);
149 149
150 void ForceExitVr(); 150 void ForceExitVr();
151 void ExitPresent();
152 151
153 void ProcessContentGesture(std::unique_ptr<blink::WebInputEvent> event); 152 void ProcessContentGesture(std::unique_ptr<blink::WebInputEvent> event);
154 void SubmitControllerModel(std::unique_ptr<VrControllerModel> model); 153 void SubmitControllerModel(std::unique_ptr<VrControllerModel> model);
155 154
156 // device::GvrGamepadDataProvider implementation. 155 // device::GvrGamepadDataProvider implementation.
157 void UpdateGamepadData(device::GvrGamepadData) override; 156 void UpdateGamepadData(device::GvrGamepadData) override;
158 void RegisterGamepadDataFetcher(device::GvrGamepadDataFetcher*) override; 157 void RegisterGamepadDataFetcher(device::GvrGamepadDataFetcher*) override;
159 158
160 private: 159 private:
161 ~VrShell() override; 160 ~VrShell() override;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 222 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
224 223
225 DISALLOW_COPY_AND_ASSIGN(VrShell); 224 DISALLOW_COPY_AND_ASSIGN(VrShell);
226 }; 225 };
227 226
228 bool RegisterVrShell(JNIEnv* env); 227 bool RegisterVrShell(JNIEnv* env);
229 228
230 } // namespace vr_shell 229 } // namespace vr_shell
231 230
232 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 231 #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