| 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..c15cc11a61e88f583eec44e1d5583e4b1a0e9a80 100644
|
| --- a/chrome/browser/android/vr_shell/color_scheme.cc
|
| +++ b/chrome/browser/android/vr_shell/color_scheme.cc
|
| @@ -18,47 +18,50 @@ void InitializeColorSchemes() {
|
| return;
|
|
|
| ColorScheme& normal_scheme = kColorSchemes[ColorScheme::kModeNormal];
|
| - normal_scheme.horizon = 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.horizon = 0xFF999999;
|
| + normal_scheme.floor = 0xFF8C8C8C;
|
| + normal_scheme.ceiling = normal_scheme.floor;
|
| + normal_scheme.floor_grid = 0x26FFFFFF;
|
| + normal_scheme.background = 0xCCB3B3B3;
|
| + normal_scheme.background_hover = 0xFFCCCCCC;
|
| + normal_scheme.background_down = 0xFFF3F3F3;
|
| normal_scheme.foreground = 0xFF333333;
|
| normal_scheme.emphasized = 0xFF000000;
|
| normal_scheme.deemphasized = 0xFF5A5A5A;
|
| - normal_scheme.separator = 0x33000000;
|
| + normal_scheme.separator = 0xFF9E9E9E;
|
| normal_scheme.secure = gfx::kGoogleGreen700;
|
| normal_scheme.insecure = gfx::kGoogleRed700;
|
| normal_scheme.warning = normal_scheme.deemphasized;
|
| normal_scheme.disabled = 0x33333333;
|
| + normal_scheme.loading_foreground = normal_scheme.foreground;
|
| + normal_scheme.loading_background = normal_scheme.floor;
|
|
|
| kColorSchemes[ColorScheme::kModeFullscreen] =
|
| kColorSchemes[ColorScheme::kModeNormal];
|
| ColorScheme& fullscreen_scheme = kColorSchemes[ColorScheme::kModeFullscreen];
|
| - fullscreen_scheme.horizon = 0xFF0A0015;
|
| + fullscreen_scheme.horizon = 0xFF000714;
|
| fullscreen_scheme.floor = 0xFF070F1C;
|
| fullscreen_scheme.ceiling = 0xFF04080F;
|
| - fullscreen_scheme.floor_grid = 0x80A3E0FF;
|
| + fullscreen_scheme.floor_grid = 0x40A3E0FF;
|
|
|
| - // TODO(joshcarpenter): Update these per spec.
|
| ColorScheme& incognito_scheme = kColorSchemes[ColorScheme::kModeIncognito];
|
| incognito_scheme.horizon = 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.separator = 0xDD595959;
|
| - incognito_scheme.secure = incognito_scheme.foreground;
|
| - incognito_scheme.insecure = incognito_scheme.foreground;
|
| - incognito_scheme.warning = incognito_scheme.foreground;
|
| + incognito_scheme.floor_grid = 0xCC595959;
|
| + incognito_scheme.foreground = 0xFFBCBCBC;
|
| + incognito_scheme.emphasized = 0xFFEDEDED;
|
| + incognito_scheme.deemphasized = 0xFF878787;
|
| + incognito_scheme.background = 0xCC454545;
|
| + incognito_scheme.background_hover = 0xCC505050;
|
| + incognito_scheme.background_down = 0xCC888888;
|
| + incognito_scheme.separator = 0xFF474747;
|
| + incognito_scheme.secure = incognito_scheme.emphasized;
|
| + incognito_scheme.insecure = incognito_scheme.emphasized;
|
| + incognito_scheme.warning = incognito_scheme.emphasized;
|
| incognito_scheme.disabled = 0x33E6E6E6;
|
| + normal_scheme.loading_foreground = 0xFF454545;
|
| + normal_scheme.loading_background = 0xFF8A8A8A;
|
|
|
| initialized = true;
|
| }
|
|
|