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

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

Issue 2612283002: Fix confusing naming re physical/dip bounds in vr_shell.cc (Closed)
Patch Set: oops Created 3 years, 11 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 const gvr::Rectf& right_bounds) override; 104 const gvr::Rectf& right_bounds) override;
105 gvr::GvrApi* gvr_api() override; 105 gvr::GvrApi* gvr_api() override;
106 void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override; 106 void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override;
107 void SetWebVRRenderSurfaceSize(int width, int height) override; 107 void SetWebVRRenderSurfaceSize(int width, int height) override;
108 gvr::Sizei GetWebVRCompositorSurfaceSize() override; 108 gvr::Sizei GetWebVRCompositorSurfaceSize() override;
109 109
110 void SurfacesChanged(jobject content_surface, jobject ui_surface); 110 void SurfacesChanged(jobject content_surface, jobject ui_surface);
111 void GvrDelegateReady(); 111 void GvrDelegateReady();
112 void AppButtonPressed(); 112 void AppButtonPressed();
113 113
114 void ContentBoundsChanged( 114 void ContentPhysicalBoundsChanged(
115 JNIEnv* env, 115 JNIEnv* env,
116 const base::android::JavaParamRef<jobject>& object, 116 const base::android::JavaParamRef<jobject>& object,
117 jint width, jint height, jfloat dpr); 117 jint width, jint height, jfloat dpr);
118 118
119 void UIBoundsChanged( 119 void UIPhysicalBoundsChanged(
120 JNIEnv* env, 120 JNIEnv* env,
121 const base::android::JavaParamRef<jobject>& object, 121 const base::android::JavaParamRef<jobject>& object,
122 jint width, jint height, jfloat dpr); 122 jint width, jint height, jfloat dpr);
123 123
124 void UpdateScene(const base::ListValue* args); 124 void UpdateScene(const base::ListValue* args);
125 125
126 // Perform a UI action triggered by the javascript API. 126 // Perform a UI action triggered by the javascript API.
127 void DoUiAction(const UiAction action); 127 void DoUiAction(const UiAction action);
128 128
129 void SetContentCssSize(float width, float height, float dpr); 129 void SetContentCssSize(float width, float height, float dpr);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 167 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
168 168
169 DISALLOW_COPY_AND_ASSIGN(VrShell); 169 DISALLOW_COPY_AND_ASSIGN(VrShell);
170 }; 170 };
171 171
172 bool RegisterVrShell(JNIEnv* env); 172 bool RegisterVrShell(JNIEnv* env);
173 173
174 } // namespace vr_shell 174 } // namespace vr_shell
175 175
176 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 176 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698