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

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

Issue 2921383002: [vr] Close exit prompt when clicking on background (Closed)
Patch Set: addressed 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 c762d1d81f031d52b0b5c3e5b1bee0c3ba51b49f..941cc8888da4388650e9723d8e379f4ce7b16143 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.h
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
@@ -54,6 +54,7 @@ class UiSceneManager {
private:
FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, UiUpdatesExitPrompt);
+ FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, BackplaneClickClosesExitPrompt);
void CreateScreenDimmer();
void CreateSecurityWarnings();
@@ -62,15 +63,18 @@ class UiSceneManager {
void CreateBackground();
void CreateUrlBar();
void CreateCloseButton();
+ void CreateExitPrompt();
void ConfigureScene();
void ConfigureSecurityWarnings();
void UpdateBackgroundColor();
+ void CloseExitPrompt();
void OnSecurityWarningTimer();
void OnBackButtonClicked();
void OnSecurityIconClicked();
void OnExitPromptPrimaryButtonClicked();
void OnExitPromptSecondaryButtonClicked();
+ void OnExitPromptBackplaneClicked();
void OnCloseButtonClicked();
void OnUnsupportedMode(UiUnsupportedMode mode);
int AllocateId();
@@ -84,9 +88,9 @@ class UiSceneManager {
UiElement* permanent_security_warning_ = nullptr;
UiElement* transient_security_warning_ = nullptr;
UiElement* exit_prompt_ = nullptr;
+ UiElement* exit_prompt_backplane_ = 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;

Powered by Google App Engine
This is Rietveld 408576698