[VrShell] Centralize color handling and enable close button on fullscreen

chrome/browser/android/vr_shell/ui_scene_manager.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 66 matching lines @@
     : browser_(browser),
       scene_(scene),
       in_cct_(in_cct),
       web_vr_mode_(in_web_vr),
       weak_ptr_factory_(this) {
   CreateBackground();
   CreateContentQuad();
   CreateSecurityWarnings();
   CreateSystemIndicators();
   CreateUrlBar();
-  if (in_cct_)
-    CreateCloseButton();
+  CreateCloseButton();
   CreateScreenDimmer();
 
   ConfigureScene();
   ConfigureSecurityWarnings();
 }
 
 UiSceneManager::~UiSceneManager() {}
 
 void UiSceneManager::CreateScreenDimmer() {
   std::unique_ptr<UiElement> element;
@@ skipping 198 matching lines @@
   std::unique_ptr<Button> element = base::MakeUnique<Button>(
       base::Bind(&UiSceneManager::OnCloseButtonClicked, base::Unretained(this)),
       base::MakeUnique<CloseButtonTexture>());
   element->set_debug_id(kCloseButton);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::NONE);
   element->set_translation(
       gfx::Vector3dF(0, kContentVerticalOffset - (kContentHeight / 2) - 0.3,
                      -kContentDistance + 0.4));
   element->set_size(gfx::Vector3dF(0.2, 0.2, 1));
-  control_elements_.push_back(element.get());
+  close_button_ = element.get();
+  control_elements_.push_back(close_button_);
   scene_->AddUiElement(std::move(element));
 }
 
 base::WeakPtr<UiSceneManager> UiSceneManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 void UiSceneManager::SetWebVrMode(bool web_vr) {
   if (web_vr_mode_ == web_vr)
     return;
@@ skipping 13 matching lines @@
   bool controls_visible = !web_vr_mode_ && !fullscreen_;
   for (UiElement* element : control_elements_) {
     element->SetEnabled(controls_visible);
   }
 
   // Content elements.
   for (UiElement* element : content_elements_) {
     element->SetEnabled(!web_vr_mode_);
   }
 
+  close_button_->SetEnabled(fullscreen_);

[cjgrant, 2017/05/31 15:39:28]

Does this break the button for CCT mode, by hiding it when not in fullscreen? 
If so, do the current tests catch this?tests cat

[amp, 2017/06/02 01:08:35]

It looks like it probably does.  I don't think we have any tests for this and
I'm not sure how to verify cct right now, but I'll do that and try to add some
tests before submitting (and make sure that the code works for cct in and out of
fullscreen).

[cjgrant, 2017/06/02 12:51:47]

We do have a CctButtonVisibleInCct test, which covers its visibility when the
scene manager is initiated with the relevant states.  I think you'd just want to
generalize the test name, and extend what's there to cover transitions as well. 
What do you think of this (note that you'd have to tweak the cases for your CL):

https://paste.googleplex.com/6588573297934336

[amp, 2017/06/02 21:40:24]

Updated.  I changed the test to be about the button specifically and covered
both in cct and not (let me know if you want a specific cct test).  I also had
the logic here wrong multiple patches.  Everything should be good on the 5th
patch set (tests are all passing).

+
   // Update content quad parameters depending on fullscreen.
   // TODO(http://crbug.com/642937): Animate fullscreen transitions.
   if (fullscreen_) {
     main_content_->set_translation(
         {0, kFullscreenVerticalOffset, -kFullscreenDistance});
     main_content_->set_size({kFullscreenWidth, kFullscreenHeight, 1});
+
+    close_button_->set_translation(gfx::Vector3dF(
+        0, kFullscreenVerticalOffset - (kFullscreenHeight / 2) - 0.1,
+        -kFullscreenDistance + 0.4));
   } else {
     // Note that main_content_ is already visible in this case.
     main_content_->set_translation(
         {0, kContentVerticalOffset, -kContentDistance});
     main_content_->set_size({kContentWidth, kContentHeight, 1});
+
+    close_button_->set_translation(
+        gfx::Vector3dF(0, kContentVerticalOffset - (kContentHeight / 2) - 0.3,
+                       -kContentDistance + 0.4));
   }
 
   scene_->SetMode(mode());
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
   UpdateBackgroundColor();
 }
 
 void UiSceneManager::UpdateBackgroundColor() {
   // TODO(vollick): it would be nice if ceiling, floor and the grid were
   // UiElement subclasses and could respond to the OnSetMode signal.
   ceiling_->set_center_color(color_scheme().ceiling);
-  ceiling_->set_edge_color(color_scheme().horizon);
+  ceiling_->set_edge_color(color_scheme().world_background);
   floor_->set_center_color(color_scheme().floor);
-  floor_->set_edge_color(color_scheme().horizon);
+  floor_->set_edge_color(color_scheme().world_background);
   floor_grid_->set_center_color(color_scheme().floor_grid);
   SkColor floor_grid_edge_color = SkColorSetA(color_scheme().floor_grid, 0);
   floor_grid_->set_edge_color(floor_grid_edge_color);
 }
 
 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) {
   audio_capturing_ = enabled;
   audio_capture_indicator_->set_visible(enabled && !web_vr_mode_);
 }
 
@@ skipping 78 matching lines @@
   scene_->set_is_exiting();
   ConfigureScene();
 }
 
 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
                                               bool can_go_forward) {
   url_bar_->SetHistoryButtonsEnabled(can_go_back);
 }
 
 void UiSceneManager::OnCloseButtonClicked() {
-  browser_->ExitCct();
+  if (fullscreen_) {
+    browser_->ExitFullscreen();
+  }
+  if (in_cct_) {
+    browser_->ExitCct();
+  }
 }
 
 void UiSceneManager::OnUnsupportedMode(UiUnsupportedMode mode) {
   browser_->OnUnsupportedMode(mode);
 }
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 ColorScheme::Mode UiSceneManager::mode() const {
   if (incognito_)
     return ColorScheme::kModeIncognito;
   if (fullscreen_)
     return ColorScheme::kModeFullscreen;
   return ColorScheme::kModeNormal;
 }
 
 const ColorScheme& UiSceneManager::color_scheme() const {
   return ColorScheme::GetColorScheme(mode());
 }
 
 }  // namespace vr_shell