ui/base/material_design/material_design_controller.cc - Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

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 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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:

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 86685cf5114f2d0db70683e5828e42960227dfe2..6718a185e2fb04523a001e2c5a6b6e2cf89e2219 100644

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

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

@@ -37,9 +37,6 @@ bool MaterialDesignController::include_secondary_ui_ = false;

void MaterialDesignController::Initialize() {

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

CHECK(!is_mode_initialized_);

-#if !defined(ENABLE_TOPCHROME_MD)

- SetMode(NON_MATERIAL);

-#else

const std::string switch_value =

base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

switches::kTopChromeMD);

@@ -61,7 +58,6 @@ void MaterialDesignController::Initialize() {

include_secondary_ui_ = base::CommandLine::ForCurrentProcess()->HasSwitch(

switches::kExtendMdToSecondaryUi);

-#endif // !defined(ENABLE_TOPCHROME_MD)

}

// static