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

chrome/browser/android/vr_shell/color_scheme.cc

Index: chrome/browser/android/vr_shell/color_scheme.cc
diff --git a/chrome/browser/android/vr_shell/color_scheme.cc b/chrome/browser/android/vr_shell/color_scheme.cc
index 49432770da2703ff5c8e26b695a93b8ad63e2b95..34695a0659e7c3daa9d98c1d586e3db257693f11 100644
--- a/chrome/browser/android/vr_shell/color_scheme.cc
+++ b/chrome/browser/android/vr_shell/color_scheme.cc
@@ -18,46 +18,52 @@ void InitializeColorSchemes() {
     return;
 
   ColorScheme& normal_scheme = kColorSchemes[ColorScheme::kModeNormal];
-  normal_scheme.horizon = 0xFFE3E3E3;
+  normal_scheme.world_background = 0xFFE3E3E3;
   normal_scheme.floor = 0xFFCFCFCF;
   normal_scheme.ceiling = 0xFFDBDBDB;
   normal_scheme.floor_grid = SK_ColorWHITE;
-  normal_scheme.background = 0x66EBEBEB;
-  normal_scheme.background_hover = 0xFFEAEAEA;
-  normal_scheme.background_down = 0xFFFAFAFA;
-  normal_scheme.foreground = 0xFF333333;
-  normal_scheme.emphasized = 0xFF000000;
-  normal_scheme.deemphasized = 0xFF5A5A5A;
+  normal_scheme.element_background = 0x66EBEBEB;
+  normal_scheme.element_background_hover = 0xFFEAEAEA;
+  normal_scheme.element_background_down = 0xFFFAFAFA;
+  normal_scheme.element_foreground = 0xFF333333;
+  normal_scheme.text_emphasized = 0xFF000000;
+  normal_scheme.text_deemphasized = 0xFF5A5A5A;
   normal_scheme.separator = 0x33000000;
   normal_scheme.secure = gfx::kGoogleGreen700;
   normal_scheme.insecure = gfx::kGoogleRed700;
-  normal_scheme.warning = normal_scheme.deemphasized;
+  normal_scheme.warning = normal_scheme.text_deemphasized;
   normal_scheme.disabled = 0x33333333;
 
   kColorSchemes[ColorScheme::kModeFullscreen] =
       kColorSchemes[ColorScheme::kModeNormal];
   ColorScheme& fullscreen_scheme = kColorSchemes[ColorScheme::kModeFullscreen];
-  fullscreen_scheme.horizon = 0xFF0A0015;
+  fullscreen_scheme.world_background = 0xFF0A0015;
   fullscreen_scheme.floor = 0xFF070F1C;
   fullscreen_scheme.ceiling = 0xFF04080F;
   fullscreen_scheme.floor_grid = 0x80A3E0FF;
+  fullscreen_scheme.element_foreground = 0xFFE6E6E6;
+  fullscreen_scheme.text_emphasized = 0xFFFFFFFF;
+  fullscreen_scheme.text_deemphasized = fullscreen_scheme.element_foreground;
+  fullscreen_scheme.element_background = 0xB9454545;
+  fullscreen_scheme.element_background_hover = 0xD9454545;
+  fullscreen_scheme.element_background_down = 0xFF454545;
 
   // TODO(joshcarpenter): Update these per spec.
   ColorScheme& incognito_scheme = kColorSchemes[ColorScheme::kModeIncognito];
-  incognito_scheme.horizon = 0xFF2E2E2E;
+  incognito_scheme.world_background = 0xFF2E2E2E;
   incognito_scheme.floor = 0xFF282828;
   incognito_scheme.ceiling = 0xFF2F2F2F;
   incognito_scheme.floor_grid = 0xFF595959;
-  incognito_scheme.foreground = 0xFFE6E6E6;
-  incognito_scheme.emphasized = 0xFFFFFFFF;
-  incognito_scheme.deemphasized = incognito_scheme.foreground;
-  incognito_scheme.background = 0xB9454545;
-  incognito_scheme.background_hover = 0xD9454545;
-  incognito_scheme.background_down = 0xFF454545;
+  incognito_scheme.element_foreground = 0xFFE6E6E6;
+  incognito_scheme.text_emphasized = 0xFFFFFFFF;
+  incognito_scheme.text_deemphasized = incognito_scheme.element_foreground;
+  incognito_scheme.element_background = 0xB9454545;
+  incognito_scheme.element_background_hover = 0xD9454545;
+  incognito_scheme.element_background_down = 0xFF454545;
   incognito_scheme.separator = 0xDD595959;
-  incognito_scheme.secure = incognito_scheme.foreground;
-  incognito_scheme.insecure = incognito_scheme.foreground;
-  incognito_scheme.warning = incognito_scheme.foreground;
+  incognito_scheme.secure = incognito_scheme.element_foreground;
+  incognito_scheme.insecure = incognito_scheme.element_foreground;
+  incognito_scheme.warning = incognito_scheme.element_foreground;
   incognito_scheme.disabled = 0x33E6E6E6;
 
   initialized = true;