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

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

Issue 2784303002: Adds button to VRShell menu mode, which lets the user manually exit WebVR presentation. (Closed)
Patch Set: Fixed closure compiler error Created 3 years, 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/vr_shell/vr_shell.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 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 RELOAD, 59 RELOAD,
60 ZOOM_OUT, 60 ZOOM_OUT,
61 ZOOM_IN, 61 ZOOM_IN,
62 RELOAD_UI, 62 RELOAD_UI,
63 LOAD_URL, 63 LOAD_URL,
64 OMNIBOX_CONTENT, 64 OMNIBOX_CONTENT,
65 SET_CONTENT_PAUSED, 65 SET_CONTENT_PAUSED,
66 SHOW_TAB, 66 SHOW_TAB,
67 OPEN_NEW_TAB, 67 OPEN_NEW_TAB,
68 KEY_EVENT, 68 KEY_EVENT,
69 EXIT_PRESENT,
69 }; 70 };
70 71
71 class VrMetricsHelper; 72 class VrMetricsHelper;
72 73
73 // The native instance of the Java VrShell. This class is not threadsafe and 74 // The native instance of the Java VrShell. This class is not threadsafe and
74 // must only be used on the UI thread. 75 // must only be used on the UI thread.
75 class VrShell : public device::GvrDelegate, 76 class VrShell : public device::GvrDelegate,
76 content::WebContentsObserver, 77 content::WebContentsObserver,
77 device::GvrGamepadDataProvider { 78 device::GvrGamepadDataProvider {
78 public: 79 public:
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 265 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
265 266
266 DISALLOW_COPY_AND_ASSIGN(VrShell); 267 DISALLOW_COPY_AND_ASSIGN(VrShell);
267 }; 268 };
268 269
269 bool RegisterVrShell(JNIEnv* env); 270 bool RegisterVrShell(JNIEnv* env);
270 271
271 } // namespace vr_shell 272 } // namespace vr_shell
272 273
273 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 274 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698