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

Unified Diff: chrome/browser/android/vr_shell/vr_gl_thread.cc

Issue 2960903002: VR: Use ToolbarModel to drive VR URL bar state. (Closed)
Patch Set: Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/vr_gl_thread.cc
diff --git a/chrome/browser/android/vr_shell/vr_gl_thread.cc b/chrome/browser/android/vr_shell/vr_gl_thread.cc
index b1fc913860660a52d51e604990c46196be2aa30d..4371edf5067f73af47ba79fe68d09833bca7bfe1 100644
--- a/chrome/browser/android/vr_shell/vr_gl_thread.cc
+++ b/chrome/browser/android/vr_shell/vr_gl_thread.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "chrome/browser/android/vr_shell/toolbar_state.h"
#include "chrome/browser/android/vr_shell/ui_interface.h"
#include "chrome/browser/android/vr_shell/ui_scene.h"
#include "chrome/browser/android/vr_shell/ui_scene_manager.h"
@@ -177,18 +178,11 @@ void VrGLThread::SetLoading(bool loading) {
weak_scene_manager_, loading));
}
-void VrGLThread::SetSecurityInfo(security_state::SecurityLevel level,
- bool malware) {
+void VrGLThread::SetToolbarState(const ToolbarState& state) {
WaitUntilThreadStarted();
- task_runner()->PostTask(FROM_HERE,
- base::Bind(&UiSceneManager::SetSecurityInfo,
- weak_scene_manager_, level, malware));
-}
-
-void VrGLThread::SetURL(const GURL& gurl) {
- WaitUntilThreadStarted();
- task_runner()->PostTask(FROM_HERE, base::Bind(&UiSceneManager::SetURL,
- weak_scene_manager_, gurl));
+ task_runner()->PostTask(
+ FROM_HERE,
+ base::Bind(&UiSceneManager::SetToolbarState, weak_scene_manager_, state));
}
void VrGLThread::SetWebVrMode(bool enabled,

Powered by Google App Engine
This is Rietveld 408576698