Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3873)

Unified Diff: chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc

Issue 2926643003: [VrShell] Centralize color handling and enable close button on fullscreen (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc
diff --git a/chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc b/chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc
index 4ed2d7c78f535f39dc4e36126bae2861a666f8a6..ab8c92557a85376634a5adff5431e56005489c32 100644
--- a/chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc
+++ b/chrome/browser/android/vr_shell/ui_elements/screen_dimmer.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/android/vr_shell/ui_elements/screen_dimmer.h"
+#include "chrome/browser/android/vr_shell/color_scheme.h"
#include "chrome/browser/android/vr_shell/ui_element_renderer.h"
#include "device/vr/vr_math.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -11,8 +12,6 @@
namespace vr_shell {
namespace {
-static const SkColor kDimmerInnerColor = 0xCC0D0D0D;
-static const SkColor kDimmerOuterColor = 0xE6000000;
static const float kDimmerOpacity = 0.9f;
} // namespace
@@ -29,8 +28,12 @@ void ScreenDimmer::Render(UiElementRenderer* renderer,
vr::Mat4f m;
vr::SetIdentityM(&m);
vr::ScaleM(m, {2.0f, 2.0f, 1.0f}, &m);
- renderer->DrawGradientQuad(m, kDimmerOuterColor, kDimmerInnerColor,
- kDimmerOpacity);
+
+ // Always use normal scheme for dimmer.
+ const ColorScheme& color_scheme =
+ ColorScheme::GetColorScheme(ColorScheme::kModeNormal);
+ renderer->DrawGradientQuad(m, color_scheme.dimmer_outer,
+ color_scheme.dimmer_inner, kDimmerOpacity);
}
} // namespace vr_shell

Powered by Google App Engine
This is Rietveld 408576698