[vr] Clicking on the security icon should prompt the user to bail out of VR

chrome/browser/android/vr_shell/ui_scene_manager.h

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..41ff4f1a5681ed9158e80161a4dd1def87b32ed7 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.h
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.h
@@ -51,6 +51,10 @@ class UiSceneManager {
   void OnAppButtonClicked();
   void OnAppButtonGesturePerformed(UiInterface::Direction direction);
 
+  // TODO(ymalik): We shouldn't have ForTesting functions.

[amp, 2017/06/02 21:53:59]

I had at one point (in a patch set, not commited) just added the macro
FRIEND_TEST_ALL_PREFIXES(UiSceneManagerTest, [testname]);

which gives the test access to more internals without having to declare specific
methods.

Would that be preferable?

[ymalik, 2017/06/04 04:08:57]

Yes, that seems better. Done.

+  void OnSecurityIconClickedForTesting();
+  void OnExitPromptPrimaryButtonClickedForTesting();
+
  private:
   void CreateScreenDimmer();
   void CreateSecurityWarnings();
@@ -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_;