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

Unified Diff: ui/base/material_design/material_design_controller.cc

Issue 1943093002: [Mac][Material Design] Make Material Design the default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable Material Design controller tests. Created 4 years, 8 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: 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 f4e633612d67d606368caf25f24105ff025f85ee..f2fd577b92e34dec8b2edd08203fbdd20e5be177 100644
--- a/ui/base/material_design/material_design_controller.cc
+++ b/ui/base/material_design/material_design_controller.cc
@@ -36,6 +36,8 @@ void MaterialDesignController::Initialize() {
CHECK(!is_mode_initialized_);
#if !defined(ENABLE_TOPCHROME_MD)
SetMode(Mode::NON_MATERIAL);
+#elif defined(OS_MACOSX)
+ SetMode(Mode::MATERIAL_NORMAL);
tdanderson 2016/05/05 14:56:55 From my reading of the code, it looks like OSX doe
shrike 2016/05/05 16:10:51 Thank you. I felt like I had seen per-platform #de
#else
const std::string switch_value =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(

Powered by Google App Engine
This is Rietveld 408576698