| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 base::Bind(&UiSceneManager::SetLoadProgress, | 164 base::Bind(&UiSceneManager::SetLoadProgress, |
| 165 weak_scene_manager_, progress)); | 165 weak_scene_manager_, progress)); |
| 166 } | 166 } |
| 167 | 167 |
| 168 void VrGLThread::SetLoading(bool loading) { | 168 void VrGLThread::SetLoading(bool loading) { |
| 169 WaitUntilThreadStarted(); | 169 WaitUntilThreadStarted(); |
| 170 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetLoading, | 170 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetLoading, |
| 171 weak_scene_manager_, loading)); | 171 weak_scene_manager_, loading)); |
| 172 } | 172 } |
| 173 | 173 |
| 174 void VrGLThread::SetSecurityLevel(security_state::SecurityLevel level) { | 174 void VrGLThread::SetSecurityInfo(security_state::SecurityLevel level, |
| 175 bool malware) { |
| 175 WaitUntilThreadStarted(); | 176 WaitUntilThreadStarted(); |
| 176 task_runner()->PostTask(FROM_HERE, | 177 task_runner()->PostTask(FROM_HERE, |
| 177 base::Bind(&UiSceneManager::SetSecurityLevel, | 178 base::Bind(&UiSceneManager::SetSecurityInfo, |
| 178 weak_scene_manager_, level)); | 179 weak_scene_manager_, level, malware)); |
| 179 } | 180 } |
| 180 | 181 |
| 181 void VrGLThread::SetURL(const GURL& gurl) { | 182 void VrGLThread::SetURL(const GURL& gurl) { |
| 182 WaitUntilThreadStarted(); | 183 WaitUntilThreadStarted(); |
| 183 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL, | 184 task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL, |
| 184 weak_scene_manager_, gurl)); | 185 weak_scene_manager_, gurl)); |
| 185 } | 186 } |
| 186 | 187 |
| 187 void VrGLThread::SetWebVrMode(bool enabled, bool auto_presented) { | 188 void VrGLThread::SetWebVrMode(bool enabled, bool auto_presented) { |
| 188 WaitUntilThreadStarted(); | 189 WaitUntilThreadStarted(); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 weak_scene_manager_)); | 223 weak_scene_manager_)); |
| 223 } | 224 } |
| 224 | 225 |
| 225 void VrGLThread::CleanUp() { | 226 void VrGLThread::CleanUp() { |
| 226 scene_manager_.reset(); | 227 scene_manager_.reset(); |
| 227 vr_shell_gl_.reset(); | 228 vr_shell_gl_.reset(); |
| 228 scene_.reset(); | 229 scene_.reset(); |
| 229 } | 230 } |
| 230 | 231 |
| 231 } // namespace vr_shell | 232 } // namespace vr_shell |
| OLD | NEW |