| OLD | NEW |
| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 enum UiAction { | 49 enum UiAction { |
| 50 HISTORY_BACK = 0, | 50 HISTORY_BACK = 0, |
| 51 HISTORY_FORWARD, | 51 HISTORY_FORWARD, |
| 52 RELOAD, | 52 RELOAD, |
| 53 ZOOM_OUT, | 53 ZOOM_OUT, |
| 54 ZOOM_IN, | 54 ZOOM_IN, |
| 55 RELOAD_UI, | 55 RELOAD_UI, |
| 56 LOAD_URL, | 56 LOAD_URL, |
| 57 OMNIBOX_CONTENT, | 57 OMNIBOX_CONTENT, |
| 58 SET_CONTENT_PAUSED, | 58 SET_CONTENT_PAUSED, |
| 59 SHOW_TAB, |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 class VrMetricsHelper; | 62 class VrMetricsHelper; |
| 62 | 63 |
| 63 // The native instance of the Java VrShell. This class is not threadsafe and | 64 // The native instance of the Java VrShell. This class is not threadsafe and |
| 64 // must only be used on the UI thread. | 65 // must only be used on the UI thread. |
| 65 class VrShell : public device::GvrDelegate, content::WebContentsObserver { | 66 class VrShell : public device::GvrDelegate, content::WebContentsObserver { |
| 66 public: | 67 public: |
| 67 VrShell(JNIEnv* env, jobject obj, | 68 VrShell(JNIEnv* env, jobject obj, |
| 68 ui::WindowAndroid* content_window, | 69 ui::WindowAndroid* content_window, |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 224 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 224 | 225 |
| 225 DISALLOW_COPY_AND_ASSIGN(VrShell); | 226 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 226 }; | 227 }; |
| 227 | 228 |
| 228 bool RegisterVrShell(JNIEnv* env); | 229 bool RegisterVrShell(JNIEnv* env); |
| 229 | 230 |
| 230 } // namespace vr_shell | 231 } // namespace vr_shell |
| 231 | 232 |
| 232 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 233 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |