chrome/browser/ui/libgtk2ui/gtk2_ui.cc - Issue 2089263002: [top-chrome-md] Allows UpdateMaterialDesignColors to be called before MDC::Initialize()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_ui.cc

Issue 2089263002: [top-chrome-md] Allows UpdateMaterialDesignColors to be called before MDC::Initialize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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/ui/libgtk2ui/gtk2_ui.cc

diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

index 769f60b68da0201d0a130b0649954e3e2b63c0d3..3b45c7188fe090f29ac23e0a0a4ec34a2069c873 100644

--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc

@@ -996,6 +996,8 @@ void Gtk2UI::LoadGtkValues() {

void Gtk2UI::UpdateMaterialDesignColors() {

// TODO(varkha): This should be merged back into LoadGtkValues() once Material

// Design is on unconditionally.

+ if (!ui::MaterialDesignController::is_mode_initialized())

Evan Stade 2016/06/22 17:17:34 nit, I'd combine this with the below check. Also,

varkha 2016/06/22 17:23:31 Done.

+ return;

if (ui::MaterialDesignController::IsModeMaterial()) {

NativeThemeGtk2* theme = NativeThemeGtk2::instance();

SkColor label_color =

« no previous file with comments | « no previous file | ui/base/material_design/material_design_controller.h » ('j') | no next file with comments »