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

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

Issue 2913633002: [vr] Clicking on the security icon should prompt the user to bail out of VR (Closed)
Patch Set: rebase 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/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 619a61f29c553c7a70fb706cc7316176c39ad17c..f3f9026b8fd0c7dd934a728bdcfbf299e97e223d 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.cc
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/android/vr_shell/ui_browser_interface.h"
#include "chrome/browser/android/vr_shell/ui_elements/audio_capture_indicator.h"
#include "chrome/browser/android/vr_shell/ui_elements/button.h"
+#include "chrome/browser/android/vr_shell/ui_elements/exit_prompt.h"
#include "chrome/browser/android/vr_shell/ui_elements/exit_warning.h"
#include "chrome/browser/android/vr_shell/ui_elements/loading_indicator.h"
#include "chrome/browser/android/vr_shell/ui_elements/permanent_security_warning.h"
@@ -51,6 +52,10 @@ static constexpr float kFullscreenHeight = 0.64 * kFullscreenDistance;
static constexpr float kFullscreenWidth = 1.138 * kFullscreenDistance;
static constexpr float kFullscreenVerticalOffset = -0.1 * kFullscreenDistance;
+static constexpr float kExitPromptWidth = 0.672 * kContentDistance;
+static constexpr float kExitPromptHeight = 0.2 * kContentDistance;
+static constexpr float kExitPromptVerticalOffset = -0.09 * kContentDistance;
+
static constexpr float kUrlBarDistance = 2.4;
static constexpr float kUrlBarWidth = 0.672 * kUrlBarDistance;
static constexpr float kUrlBarHeight = 0.088 * kUrlBarDistance;
@@ -224,9 +229,26 @@ void UiSceneManager::CreateContentQuad() {
element->set_size({kBackplaneSize, kBackplaneSize, 1.0});
element->set_translation({0.0, 0.0, -kTextureOffset});
element->set_parent_id(main_content_->id());
+ main_content_backplane_ = element.get();
content_elements_.push_back(element.get());
scene_->AddUiElement(std::move(element));
+ element = base::MakeUnique<ExitPrompt>(
+ 512,
+ base::Bind(&UiSceneManager::OnExitPromptPrimaryButtonClicked,
+ base::Unretained(this)),
+ base::Bind(&UiSceneManager::OnExitPromptSecondaryButtonClicked,
+ base::Unretained(this)));
+ element->set_debug_id(kExitPrompt);
+ element->set_id(AllocateId());
+ element->set_fill(vr_shell::Fill::NONE);
+ element->set_size({kExitPromptWidth, kExitPromptHeight, 1});
+ element->set_translation({0.0, kExitPromptVerticalOffset, kTextureOffset});
+ element->set_parent_id(main_content_->id());
+ element->set_visible(false);
+ exit_prompt_ = element.get();
+ scene_->AddUiElement(std::move(element));
+
// Limit reticle distance to a sphere based on content distance.
scene_->SetBackgroundDistance(main_content_->translation().z() *
-kBackgroundDistanceMultiplier);
@@ -246,7 +268,7 @@ void UiSceneManager::CreateBackground() {
element->set_draw_phase(0);
element->set_gridline_count(kFloorGridlineCount);
floor_ = element.get();
- content_elements_.push_back(element.get());
+ background_elements_.push_back(element.get());
scene_->AddUiElement(std::move(element));
// Ceiling.
@@ -259,7 +281,7 @@ void UiSceneManager::CreateBackground() {
element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
element->set_draw_phase(0);
ceiling_ = element.get();
- content_elements_.push_back(element.get());
+ background_elements_.push_back(element.get());
scene_->AddUiElement(std::move(element));
UpdateBackgroundColor();
@@ -269,14 +291,15 @@ void UiSceneManager::CreateUrlBar() {
// TODO(cjgrant): Incorporate final size and position.
auto url_bar = base::MakeUnique<UrlBar>(
512,
+ base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)),
+ base::Bind(&UiSceneManager::OnSecurityIconClicked,
+ base::Unretained(this)),
base::Bind(&UiSceneManager::OnUnsupportedMode, base::Unretained(this)));
url_bar->set_debug_id(kUrlBar);
url_bar->set_id(AllocateId());
url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance});
url_bar->set_rotation({1.0, 0.0, 0.0, kUrlBarRotationRad});
url_bar->set_size({kUrlBarWidth, kUrlBarHeight, 1});
- url_bar->SetBackButtonCallback(
- base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
url_bar_ = url_bar.get();
control_elements_.push_back(url_bar.get());
scene_->AddUiElement(std::move(url_bar));
@@ -326,12 +349,13 @@ void UiSceneManager::SetWebVrMode(bool web_vr) {
void UiSceneManager::ConfigureScene() {
exit_warning_->SetEnabled(scene_->is_exiting());
+ exit_prompt_->SetEnabled(scene_->is_prompting_to_exit());
screen_dimmer_->SetEnabled(scene_->is_exiting());
// Controls (URL bar, loading progress, etc).
bool controls_visible = !web_vr_mode_ && !fullscreen_;
for (UiElement* element : control_elements_) {
- element->SetEnabled(controls_visible);
+ element->SetEnabled(controls_visible && !scene_->is_prompting_to_exit());
}
// Close button is a special control element that needs to be hidden when in
@@ -339,7 +363,10 @@ void UiSceneManager::ConfigureScene() {
close_button_->SetEnabled(!web_vr_mode_ && (fullscreen_ || in_cct_));
// Content elements.
- for (UiElement* element : content_elements_) {
+ main_content_->SetEnabled(!web_vr_mode_ && !scene_->is_prompting_to_exit());
+ main_content_backplane_->SetEnabled(!web_vr_mode_);
+ // Background elements.
+ for (UiElement* element : background_elements_) {
element->SetEnabled(!web_vr_mode_);
}
@@ -448,6 +475,24 @@ void UiSceneManager::OnBackButtonClicked() {
browser_->NavigateBack();
}
+void UiSceneManager::OnSecurityIconClicked() {
+ if (scene_->is_prompting_to_exit())
+ return;
+ scene_->set_is_prompting_to_exit(true);
+ ConfigureScene();
+}
+
+void UiSceneManager::OnExitPromptPrimaryButtonClicked() {
+ if (!scene_->is_prompting_to_exit())
+ return;
+ scene_->set_is_prompting_to_exit(false);
+ ConfigureScene();
+}
+
+void UiSceneManager::OnExitPromptSecondaryButtonClicked() {
+ OnUnsupportedMode(UiUnsupportedMode::kUnhandledPageInfo);
+}
+
void UiSceneManager::SetURL(const GURL& gurl) {
url_bar_->SetURL(gurl);
}
« 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