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

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

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

Powered by Google App Engine
This is Rietveld 408576698