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

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

Issue 2872773002: VR: Render the current URL and security level on the URL bar. (Closed)
Patch Set: Revert the inclusion of the lock icon; will re-add when moved to UI. Created 3 years, 7 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/ui_scene_manager.cc
diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.cc b/chrome/browser/android/vr_shell/ui_scene_manager.cc
index e617824e72653d7d8d1d933655fc7ac35fc2c26a..857d4d2eb59e1b0d48aa790947a17793b7cbfcfe 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.cc
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc
@@ -194,6 +194,8 @@ void UiSceneManager::CreateUrlBar() {
element->set_id(AllocateId());
element->set_translation({0, -0.9, -1.8});
element->set_size({0.9, 0, 1});
+ element->SetBackButtonCallback(
+ base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
url_bar_ = element.get();
browser_ui_elements_.push_back(element.get());
scene_->AddUiElement(std::move(element));
@@ -210,6 +212,7 @@ void UiSceneManager::SetWebVrMode(bool web_vr) {
for (UiElement* element : browser_ui_elements_) {
element->set_visible(!web_vr_mode_);
}
+ url_bar_->SetEnabled(!web_vr);
ConfigureSecurityWarnings();
}
@@ -274,11 +277,17 @@ void UiSceneManager::OnSecurityWarningTimer() {
transient_security_warning_->set_visible(false);
}
+void UiSceneManager::OnBackButtonClicked() {
+ browser_->NavigateBack();
+}
+
void UiSceneManager::SetURL(const GURL& gurl) {
url_bar_->SetURL(gurl);
}
-void UiSceneManager::SetSecurityLevel(int level) {}
+void UiSceneManager::SetSecurityLevel(int level) {
+ url_bar_->SetSecurityLevel(level);
+}
void UiSceneManager::SetLoading(bool loading) {}
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene_manager.h ('k') | chrome/browser/android/vr_shell/ui_scene_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698