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

chrome/browser/android/vr_shell/ui_scene_manager.cc

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 f11735842f8c3e222eb32ea1eafe3a69c96cfb1e..1600b080b2cac7d8782140bb4560eacf9c5577a3 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.cc
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc
@@ -84,8 +84,7 @@ UiSceneManager::UiSceneManager(VrBrowserInterface* browser,
   CreateSecurityWarnings();
   CreateSystemIndicators();
   CreateUrlBar();
-  if (in_cct_)
-    CreateCloseButton();
+  CreateCloseButton();
   CreateScreenDimmer();
 
   ConfigureScene();
@@ -304,7 +303,8 @@ void UiSceneManager::CreateCloseButton() {
       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));
 }
 
@@ -338,17 +338,27 @@ void UiSceneManager::ConfigureScene() {
     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());
@@ -361,9 +371,9 @@ 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);
@@ -462,7 +472,12 @@ void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
 }
 
 void UiSceneManager::OnCloseButtonClicked() {
-  browser_->ExitCct();
+  if (fullscreen_) {
+    browser_->ExitFullscreen();
+  }
+  if (in_cct_) {
+    browser_->ExitCct();
+  }
 }
 
 void UiSceneManager::OnUnsupportedMode(UiUnsupportedMode mode) {