Chromium Code Reviews| Index: chrome/browser/android/vr_shell/vr_shell.cc |
| diff --git a/chrome/browser/android/vr_shell/vr_shell.cc b/chrome/browser/android/vr_shell/vr_shell.cc |
| index f4547ffa155cd1664e6b66ecf17fb969a77b819f..22b757ccedc7dda53bc4683324a8cf4049fe7eaa 100644 |
| --- a/chrome/browser/android/vr_shell/vr_shell.cc |
| +++ b/chrome/browser/android/vr_shell/vr_shell.cc |
| @@ -21,6 +21,7 @@ |
| #include "chrome/browser/android/tab_android.h" |
| #include "chrome/browser/android/vr_shell/android_ui_gesture_target.h" |
| #include "chrome/browser/android/vr_shell/ui_interface.h" |
| +#include "chrome/browser/android/vr_shell/ui_scene_manager.h" |
| #include "chrome/browser/android/vr_shell/vr_compositor.h" |
| #include "chrome/browser/android/vr_shell/vr_controller_model.h" |
| #include "chrome/browser/android/vr_shell/vr_gl_thread.h" |
| @@ -303,6 +304,8 @@ void VrShell::SetWebVrMode(JNIEnv* env, |
| html_interface_->SetMode(enabled ? UiInterface::Mode::WEB_VR |
| : UiInterface::Mode::STANDARD); |
| + PostToGlThreadWhenReady(base::Bind(&UiSceneManager::SetWebVRMode, |
|
cjgrant
2017/04/11 14:54:30
This is what clang-format does; not how I would ha
|
| + gl_thread_->GetSceneManager(), enabled)); |
| } |
| void VrShell::OnLoadProgressChanged(JNIEnv* env, |
| @@ -352,6 +355,9 @@ void VrShell::OnTabRemoved(JNIEnv* env, |
| void VrShell::SetWebVRSecureOrigin(bool secure_origin) { |
| // TODO(cjgrant): Align this state with the logic that drives the omnibox. |
| html_interface_->SetWebVRSecureOrigin(secure_origin); |
| + PostToGlThreadWhenReady(base::Bind(&UiSceneManager::SetWebVRSecureOrigin, |
| + gl_thread_->GetSceneManager(), |
| + secure_origin)); |
| } |
| void VrShell::SubmitWebVRFrame(int16_t frame_index, |
| @@ -468,8 +474,8 @@ UiInterface* VrShell::GetUiInterface() { |
| } |
| void VrShell::UpdateScene(const base::ListValue* args) { |
| - PostToGlThreadWhenReady(base::Bind(&VrShellGl::UpdateScene, |
| - gl_thread_->GetVrShellGl(), |
| + PostToGlThreadWhenReady(base::Bind(&UiSceneManager::UpdateScene, |
| + gl_thread_->GetSceneManager(), |
| base::Passed(args->CreateDeepCopy()))); |
| } |