Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

ui/base/material_design/material_design_controller.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #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"
@@ skipping 19 matching lines @@
 
 MaterialDesignController::Mode MaterialDesignController::mode_ =
     MaterialDesignController::NON_MATERIAL;
 
 bool MaterialDesignController::include_secondary_ui_ = false;
 
 // static
 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);
 
   if (switch_value == switches::kTopChromeMDMaterial) {
     SetMode(MATERIAL_NORMAL);
   } else if (switch_value == switches::kTopChromeMDMaterialHybrid) {
     SetMode(MATERIAL_HYBRID);
   } else if (switch_value == switches::kTopChromeMDNonMaterial) {
     SetMode(NON_MATERIAL);
   } else {
     if (!switch_value.empty()) {
       LOG(ERROR) << "Invalid value='" << switch_value
                  << "' for command line switch '" << switches::kTopChromeMD
                  << "'.";
     }
     SetMode(DefaultMode());
   }
 
   include_secondary_ui_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kExtendMdToSecondaryUi);
-#endif  // !defined(ENABLE_TOPCHROME_MD)
 }
 
 // static
 MaterialDesignController::Mode MaterialDesignController::GetMode() {
   CHECK(is_mode_initialized_);
   return mode_;
 }
 
 // static
 bool MaterialDesignController::IsModeMaterial() {
@@ skipping 50 matching lines @@
   is_mode_initialized_ = false;
 }
 
 // static
 void MaterialDesignController::SetMode(MaterialDesignController::Mode mode) {
   mode_ = mode;
   is_mode_initialized_ = true;
 }
 
 }  // namespace ui