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

Unified Diff: chrome/browser/android/vr_shell/textures/ui_texture.cc

Issue 2914623003: [VrShell] Centralize color handling and enable close button on fullscreen (Closed)
Patch Set: clean up after rebase Created 3 years, 7 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/textures/ui_texture.cc
diff --git a/chrome/browser/android/vr_shell/textures/ui_texture.cc b/chrome/browser/android/vr_shell/textures/ui_texture.cc
index 99b9705361b604169d7d76a013dd8d18ba0a04bf..50d374810abb9cc754ae1cdc76f1f9cd28cfe6b4 100644
--- a/chrome/browser/android/vr_shell/textures/ui_texture.cc
+++ b/chrome/browser/android/vr_shell/textures/ui_texture.cc
@@ -13,6 +13,7 @@
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
+#include "chrome/browser/android/vr_shell/color_scheme.h"
cjgrant 2017/06/05 17:57:08 This is already in ui_texture.h
amp 2017/06/05 21:40:58 Done.
#include "chrome/browser/android/vr_shell/font_fallback.h"
#include "chrome/browser/browser_process.h"
#include "third_party/icu/source/common/unicode/uscript.h"
@@ -65,6 +66,10 @@ void UiTexture::SetMode(ColorScheme::Mode mode) {
void UiTexture::OnSetMode() {}
+const ColorScheme& UiTexture::color_scheme() const {
+ return ColorScheme::GetColorScheme(mode());
+}
+
std::vector<std::unique_ptr<gfx::RenderText>> UiTexture::PrepareDrawStringRect(
const base::string16& text,
const gfx::FontList& font_list,

Powered by Google App Engine
This is Rietveld 408576698