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

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

Issue 2913633002: [vr] Clicking on the security icon should prompt the user to bail out of VR (Closed)
Patch Set: address amp's comments 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.h
diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.h b/chrome/browser/android/vr_shell/ui_scene_manager.h
index ba4ddd8ec1f536fbf9a130f097259571e306d8e9..1f0f81f7160736e453ba142b2fc1def4aed78c6b 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.h
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
@@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
#define CHROME_BROWSER_ANDROID_VR_SHELL_UI_SCENE_MANAGER_H_
+#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
@@ -52,6 +53,9 @@ class UiSceneManager {
void OnAppButtonGesturePerformed(UiInterface::Direction direction);
private:
+ friend class UiSceneManagerTest;
+ FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, UiUpdatesExitPrompt);
+
void CreateScreenDimmer();
void CreateSecurityWarnings();
void CreateSystemIndicators();
@@ -59,13 +63,15 @@ class UiSceneManager {
void CreateBackground();
void CreateUrlBar();
void CreateCloseButton();
- void CreateExitWarning();
void ConfigureScene();
void ConfigureSecurityWarnings();
void UpdateBackgroundColor();
void OnSecurityWarningTimer();
void OnBackButtonClicked();
+ void OnSecurityIconClicked();
+ void OnExitPromptPrimaryButtonClicked();
+ void OnExitPromptSecondaryButtonClicked();
void OnCloseButtonClicked();
void OnUnsupportedMode(UiUnsupportedMode mode);
int AllocateId();
@@ -78,8 +84,10 @@ class UiSceneManager {
// UI element pointers (not owned by the scene manager).
UiElement* permanent_security_warning_ = nullptr;
UiElement* transient_security_warning_ = nullptr;
+ UiElement* exit_prompt_ = nullptr;
UiElement* exit_warning_ = nullptr;
UiElement* main_content_ = nullptr;
+ UiElement* main_content_backplane_ = nullptr;
UiElement* audio_capture_indicator_ = nullptr;
UiElement* video_capture_indicator_ = nullptr;
UiElement* screen_capture_indicator_ = nullptr;
@@ -94,7 +102,6 @@ class UiSceneManager {
bool secure_origin_ = false;
bool fullscreen_ = false;
bool incognito_ = false;
- bool is_exiting_ = false;
bool audio_capturing_ = false;
bool video_capturing_ = false;
bool screen_capturing_ = false;
@@ -102,6 +109,7 @@ class UiSceneManager {
int next_available_id_ = 1;
std::vector<UiElement*> content_elements_;
+ std::vector<UiElement*> background_elements_;
std::vector<UiElement*> control_elements_;
base::OneShotTimer security_warning_timer_;

Powered by Google App Engine
This is Rietveld 408576698