[Views] App Menu Icon Update

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 543 matching lines @@
      ash::switches::kAshForceTabletModeTouchView},
     {flag_descriptions::kForceTabletModeClamshell,
      ash::switches::kAshForceTabletMode,
      ash::switches::kAshForceTabletModeClamshell},
     {flag_descriptions::kForceTabletModeAuto,
      ash::switches::kAshForceTabletMode,
      ash::switches::kAshForceTabletModeAuto},
 };
 #endif  // OS_CHROMEOS
 
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
-    defined(OS_WIN)
-const FeatureEntry::Choice kAppMenuIconChoices[] = {
-    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
-    {flag_descriptions::kAppMenuIconOldBehavior, switches::kAppMenuIcon,
-     switches::kAppMenuIconOldBehavior},
-    {flag_descriptions::kAppMenuIconPersistentOpenedState,
-     switches::kAppMenuIcon, switches::kAppMenuIconPersistentOpenedState},
-    {flag_descriptions::kAppMenuIconPersistentClosedState,
-     switches::kAppMenuIcon, switches::kAppMenuIconPersistentClosedState},
-};
-#endif  // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
-        // defined(OS_WIN)
-
 #if defined(OS_ANDROID)
 const FeatureEntry::FeatureParam
     kContentSuggestionsCategoryOrderFeatureVariationGeneral[] = {
         {ntp_snippets::kCategoryOrderParameter,
          ntp_snippets::kCategoryOrderGeneral},
 };
 
 const FeatureEntry::FeatureParam
     kContentSuggestionsCategoryOrderFeatureVariationEMOriented[] = {
         {ntp_snippets::kCategoryOrderParameter,
@@ skipping 2044 matching lines @@
     {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName,
      flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
      FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
 
 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
     defined(OS_WIN)
     {"omnibox-entity-suggestions",
      flag_descriptions::kOmniboxEntitySuggestionsName,
      flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
-    {"app-menu-icon", flag_descriptions::kAppMenuIconName,
-     flag_descriptions::kAppMenuIconDescription, kOsDesktop,
-     MULTI_VALUE_TYPE(kAppMenuIconChoices)},
+    {"enable-new-app-menu-icon", flag_descriptions::kEnableNewAppMenuIconName,
+     flag_descriptions::kEnableNewAppMenuIconDescription, kOsDesktop,
+     SINGLE_VALUE_TYPE(switches::kEnableNewAppMenuIcon)},
 #endif  // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) ||
         // defined(OS_WIN)
 
 #if defined(OS_ANDROID)
     {"enable-custom-feedback-ui",
      flag_descriptions::kEnableCustomFeedbackUiName,
      flag_descriptions::kEnableCustomFeedbackUiDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kCustomFeedbackUi)},
 #endif  // OS_ANDROID
 
@@ skipping 333 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags