ui/base/material_design/material_design_controller.cc - Issue 1845343005: Makes MaterialDesignController initialization explicit

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: ui/base/material_design/material_design_controller.cc

Issue 1845343005: Makes MaterialDesignController initialization explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added UpdatewithLocalState call to update colors after MD flag is added to the command line Created 4 years, 9 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

« chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('K') | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc ('k') | ui/views/linux_ui/linux_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/base/material_design/material_design_controller.cc

diff --git a/ui/base/material_design/material_design_controller.cc b/ui/base/material_design/material_design_controller.cc

index 411f553a8ba2176680caf3caebaad04334e26c84..9bec3ae6e81f1e1774529ed964e894f852c33547 100644

--- a/ui/base/material_design/material_design_controller.cc

+++ b/ui/base/material_design/material_design_controller.cc

@@ -6,6 +6,7 @@

#include "base/command_line.h"

#include "base/logging.h"

+#include "base/trace_event/trace_event.h"

#include "ui/base/material_design/material_design_controller.h"

#include "ui/base/ui_base_switches.h"

@@ -75,6 +76,7 @@ MaterialDesignController::Mode MaterialDesignController::DefaultMode() {

}

void MaterialDesignController::InitializeMode() {

+ TRACE_EVENT0("startup", "MaterialDesignController::InitializeMode");

#if !defined(ENABLE_TOPCHROME_MD)

SetMode(Mode::NON_MATERIAL);

#else