| 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 #include "chrome/browser/android/vr_shell/vr_gl_thread.h" | 5 #include "chrome/browser/android/vr_shell/vr_gl_thread.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "chrome/browser/android/vr_shell/ui_interface.h" | 9 #include "chrome/browser/android/vr_shell/ui_interface.h" |
| 10 #include "chrome/browser/android/vr_shell/ui_scene.h" | 10 #include "chrome/browser/android/vr_shell/ui_scene.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 base::Bind(&UiSceneManager::SetLoadProgress, | 148 base::Bind(&UiSceneManager::SetLoadProgress, |
| 149 weak_scene_manager_, progress)); | 149 weak_scene_manager_, progress)); |
| 150 } | 150 } |
| 151 | 151 |
| 152 void VrGLThread::SetLoading(bool loading) { | 152 void VrGLThread::SetLoading(bool loading) { |
| 153 WaitUntilThreadStarted(); | 153 WaitUntilThreadStarted(); |
| 154 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetLoading, | 154 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetLoading, |
| 155 weak_scene_manager_, loading)); | 155 weak_scene_manager_, loading)); |
| 156 } | 156 } |
| 157 | 157 |
| 158 void VrGLThread::SetSecurityLevel(int level) { | 158 void VrGLThread::SetSecurityLevel(security_state::SecurityLevel level) { |
| 159 WaitUntilThreadStarted(); | 159 WaitUntilThreadStarted(); |
| 160 task_runner()->PostTask(FROM_HERE, | 160 task_runner()->PostTask(FROM_HERE, |
| 161 base::Bind(&UiSceneManager::SetSecurityLevel, | 161 base::Bind(&UiSceneManager::SetSecurityLevel, |
| 162 weak_scene_manager_, level)); | 162 weak_scene_manager_, level)); |
| 163 } | 163 } |
| 164 | 164 |
| 165 void VrGLThread::SetURL(const GURL& gurl) { | 165 void VrGLThread::SetURL(const GURL& gurl) { |
| 166 WaitUntilThreadStarted(); | 166 WaitUntilThreadStarted(); |
| 167 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL, | 167 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL, |
| 168 weak_scene_manager_, gurl)); | 168 weak_scene_manager_, gurl)); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 weak_scene_manager_)); | 205 weak_scene_manager_)); |
| 206 } | 206 } |
| 207 | 207 |
| 208 void VrGLThread::CleanUp() { | 208 void VrGLThread::CleanUp() { |
| 209 scene_manager_.reset(); | 209 scene_manager_.reset(); |
| 210 vr_shell_gl_.reset(); | 210 vr_shell_gl_.reset(); |
| 211 scene_.reset(); | 211 scene_.reset(); |
| 212 } | 212 } |
| 213 | 213 |
| 214 } // namespace vr_shell | 214 } // namespace vr_shell |
| OLD | NEW |