Introduce new flag to control usage of MD in secondary (not top-chrome)

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 10 matching lines @@
 #include "ui/events/ozone/evdev/event_device_info.h"
 #endif  // defined(USE_OZONE)
 
 #endif  // defined(OS_CHROMEOS)
 
 namespace ui {
 
 bool MaterialDesignController::is_mode_initialized_ = false;
 
 MaterialDesignController::Mode MaterialDesignController::mode_ =
-    MaterialDesignController::Mode::NON_MATERIAL;
+    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(Mode::NON_MATERIAL);
+  SetMode(NON_MATERIAL);
 #else
   const std::string switch_value =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kTopChromeMD);
 
   if (switch_value == switches::kTopChromeMDMaterial) {
-    SetMode(Mode::MATERIAL_NORMAL);
+    SetMode(MATERIAL_NORMAL);
   } else if (switch_value == switches::kTopChromeMDMaterialHybrid) {
-    SetMode(Mode::MATERIAL_HYBRID);
+    SetMode(MATERIAL_HYBRID);
   } else if (switch_value == switches::kTopChromeMDNonMaterial) {
-    SetMode(Mode::NON_MATERIAL);
+    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() {
-  return GetMode() == Mode::MATERIAL_NORMAL ||
-         GetMode() == Mode::MATERIAL_HYBRID;
+  return GetMode() == MATERIAL_NORMAL || GetMode() == MATERIAL_HYBRID;
 }
 
 // static
+bool MaterialDesignController::IsSecondaryUiMaterial() {
+  return IsModeMaterial() && include_secondary_ui_;
+}
+
+// static
 MaterialDesignController::Mode MaterialDesignController::DefaultMode() {
 #if defined(OS_CHROMEOS)
   if (DeviceDataManager::HasInstance() &&
       DeviceDataManager::GetInstance()->device_lists_complete()) {
-    return GetTouchScreensAvailability() == TouchScreensAvailability::ENABLED ?
-        Mode::MATERIAL_HYBRID : Mode::MATERIAL_NORMAL;
+    return GetTouchScreensAvailability() == TouchScreensAvailability::ENABLED
+               ? MATERIAL_HYBRID
+               : MATERIAL_NORMAL;
   }
 
 #if defined(USE_OZONE)
   base::FileEnumerator file_enum(
       base::FilePath(FILE_PATH_LITERAL("/dev/input")), false,
       base::FileEnumerator::FILES, FILE_PATH_LITERAL("event*[0-9]"));
   for (base::FilePath path = file_enum.Next(); !path.empty();
        path = file_enum.Next()) {
     EventDeviceInfo devinfo;
     int fd = open(path.value().c_str(), O_RDWR | O_NONBLOCK | O_CLOEXEC);
     if (fd >= 0) {
       if (devinfo.Initialize(fd, path) && devinfo.HasTouchscreen()) {
         close(fd);
-        return Mode::MATERIAL_HYBRID;
+        return MATERIAL_HYBRID;
       }
       close(fd);
     }
   }
 #endif  // defined(USE_OZONE)
-  return Mode::MATERIAL_NORMAL;
+  return MATERIAL_NORMAL;
 #elif defined(OS_LINUX)
-  return Mode::MATERIAL_NORMAL;
+  return MATERIAL_NORMAL;
 #else
-  return Mode::NON_MATERIAL;
+  return NON_MATERIAL;
 #endif  // defined(OS_CHROMEOS)
 }
 
 // static
 void MaterialDesignController::Uninitialize() {
   is_mode_initialized_ = false;
 }
 
 // static
 void MaterialDesignController::SetMode(MaterialDesignController::Mode mode) {
   mode_ = mode;
   is_mode_initialized_ = true;
 }
 
 }  // namespace ui