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

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

Issue 2571713006: Fix some thread safety violations in device::GvrDelegate implementation. (Closed)
Patch Set: Created 4 years 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 void QueueTask(base::Callback<void()>& callback); 124 void QueueTask(base::Callback<void()>& callback);
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);
130 void SetUiCssSize(float width, float height, float dpr); 130 void SetUiCssSize(float width, float height, float dpr);
131 131
132 void ContentFrameWasResized(bool width_changed); 132 void ContentFrameWasResized(bool width_changed);
133 133
134 void ForceExitVR(); 134 void ForceExitVr();
135 135
136 private: 136 private:
137 ~VrShell() override; 137 ~VrShell() override;
138 void SetShowingOverscrollGlow(bool showing_glow); 138 void SetShowingOverscrollGlow(bool showing_glow);
139 139
140 // content::WebContentsObserver implementation. All called on UI thread. 140 // content::WebContentsObserver implementation. All called on UI thread.
141 void RenderViewHostChanged(content::RenderViewHost* old_host, 141 void RenderViewHostChanged(content::RenderViewHost* old_host,
142 content::RenderViewHost* new_host) override; 142 content::RenderViewHost* new_host) override;
143 void MainFrameWasResized(bool width_changed) override; 143 void MainFrameWasResized(bool width_changed) override;
144 void WebContentsDestroyed() override; 144 void WebContentsDestroyed() override;
(...skipping 20 matching lines...) Expand all
165 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 165 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
166 166
167 DISALLOW_COPY_AND_ASSIGN(VrShell); 167 DISALLOW_COPY_AND_ASSIGN(VrShell);
168 }; 168 };
169 169
170 bool RegisterVrShell(JNIEnv* env); 170 bool RegisterVrShell(JNIEnv* env);
171 171
172 } // namespace vr_shell 172 } // namespace vr_shell
173 173
174 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 174 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_compositor.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