Moved --top-chrome-md command line switch from chrome_switches to ui_base_switches.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 408 matching lines @@
     "none" },
   { IDS_ASH_SCREEN_ROTATION_ANIMATION_PARTIAL_ROTATION,
     ash::switches::kAshEnableScreenRotationAnimation,
     "partial-rotation" },
   { IDS_ASH_SCREEN_ROTATION_ANIMATION_FULL_ROTATION,
     ash::switches::kAshEnableScreenRotationAnimation,
     "full-rotation" }
 };
 #endif
 
+#if defined(ENABLE_TOPCHROME_MD)
+const Experiment::Choice kTopChromeMaterialDesignChoices[] = {
+    {IDS_FLAGS_TOP_CHROME_MD_NON_MATERIAL, "", ""},
+    {IDS_FLAGS_TOP_CHROME_MD_MATERIAL,
+     switches::kTopChromeMD,
+     switches::kTopChromeMDMaterial},
+    {IDS_FLAGS_TOP_CHROME_MD_MATERIAL_HYBRID,
+     switches::kTopChromeMD,
+     switches::kTopChromeMDMaterialHybrid}};
+#endif
+
 #if defined(OS_CHROMEOS)
 const Experiment::Choice kDataSaverPromptChoices[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     chromeos::switches::kDisableDataSaverPrompt, "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     chromeos::switches::kEnableDataSaverPrompt, "" },
   { IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE,
     chromeos::switches::kEnableDataSaverPrompt,
     chromeos::switches::kDataSaverPromptDemoMode },
@@ skipping 350 matching lines @@
 #endif
     {"enable-scroll-prediction",
      IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME,
      IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)},
 #if defined(ENABLE_TOPCHROME_MD)
     {"top-chrome-md",
      IDS_FLAGS_TOP_CHROME_MD,
      IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION,
      kOsWin | kOsCrOS,

[tdanderson, 2015/06/26 21:38:23]

I just noticed you're missing Linux here. Mind adding that in a follow-up?

[bruthig, 2015/06/29 14:18:57]

https://codereview.chromium.org/1219683003

-     ENABLE_DISABLE_VALUE_TYPE(switches::kTopChromeMDEnabled,
-                               switches::kTopChromeMDDisabled)},
+     MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
 #endif
     {"touch-events",
      IDS_TOUCH_EVENTS_NAME,
      IDS_TOUCH_EVENTS_DESCRIPTION,
      kOsDesktop,
      MULTI_VALUE_TYPE(kTouchEventsChoices)},
     {"disable-touch-adjustment",
      IDS_DISABLE_TOUCH_ADJUSTMENT_NAME,
      IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
@@ skipping 1805 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags