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

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

Issue 2001093002: Revert of Remove enable_topchrome_md build flag (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/grit/grit_rule.gni ('k') | ui/base/material_design/material_design_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 6718a185e2fb04523a001e2c5a6b6e2cf89e2219..86685cf5114f2d0db70683e5828e42960227dfe2 100644
--- a/ui/base/material_design/material_design_controller.cc
+++ b/ui/base/material_design/material_design_controller.cc
@@ -37,6 +37,9 @@
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);
@@ -58,6 +61,7 @@
include_secondary_ui_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kExtendMdToSecondaryUi);
+#endif // !defined(ENABLE_TOPCHROME_MD)
}
// static
« no previous file with comments | « tools/grit/grit_rule.gni ('k') | ui/base/material_design/material_design_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698