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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 2903293002: [Android] Omnibox Placeholder Experiment (Closed)
Patch Set: Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 #if defined(OS_ANDROID) 660 #if defined(OS_ANDROID)
661 const FeatureEntry::Choice kHerbPrototypeChoices[] = { 661 const FeatureEntry::Choice kHerbPrototypeChoices[] = {
662 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 662 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
663 {flags_ui::kGenericExperimentChoiceDisabled, 663 {flags_ui::kGenericExperimentChoiceDisabled,
664 switches::kTabManagementExperimentTypeDisabled, ""}, 664 switches::kTabManagementExperimentTypeDisabled, ""},
665 {flag_descriptions::kHerbPrototypeFlavorElderberry, 665 {flag_descriptions::kHerbPrototypeFlavorElderberry,
666 switches::kTabManagementExperimentTypeElderberry, ""}, 666 switches::kTabManagementExperimentTypeElderberry, ""},
667 }; 667 };
668 #endif // OS_ANDROID 668 #endif // OS_ANDROID
669 669
670 #if defined(OS_ANDROID)
671 const FeatureEntry::Choice kOmniboxPlaceholderExperimentChoices[] = {
672 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
673 {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeUrl,
674 switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeUrl"},
675 {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeWebsiteName,
676 switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeWebsiteName"},
677 {flag_descriptions::kOmniboxPlaceholderExperimentSearchTheWeb,
678 switches::kOmniboxPlaceholderExperimentSwitch, "SearchTheWeb"},
679 {flag_descriptions::kOmniboxPlaceholderExperimentEnterASearchOrWebsite,
680 switches::kOmniboxPlaceholderExperimentSwitch, "EnterASearchOrWebsite"},
681 {flag_descriptions::kOmniboxPlaceholderExperimentSearchNews,
682 switches::kOmniboxPlaceholderExperimentSwitch, "SearchNews"},
683 {flag_descriptions::kOmniboxPlaceholderExperimentSearchRecipes,
684 switches::kOmniboxPlaceholderExperimentSwitch, "SearchRecipes"},
685 {flag_descriptions::kOmniboxPlaceholderExperimentSearchWeather,
686 switches::kOmniboxPlaceholderExperimentSwitch, "SearchWeather"},
687 {flag_descriptions::kOmniboxPlaceholderExperimentBlank,
688 switches::kOmniboxPlaceholderExperimentSwitch, "Blank"},
689 };
690 #endif // OS_ANDROID
691
670 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = { 692 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = {
671 {flag_descriptions::kEnableUseZoomForDsfChoiceDefault, "", ""}, 693 {flag_descriptions::kEnableUseZoomForDsfChoiceDefault, "", ""},
672 {flag_descriptions::kEnableUseZoomForDsfChoiceEnabled, 694 {flag_descriptions::kEnableUseZoomForDsfChoiceEnabled,
673 switches::kEnableUseZoomForDSF, "true"}, 695 switches::kEnableUseZoomForDSF, "true"},
674 {flag_descriptions::kEnableUseZoomForDsfChoiceDisabled, 696 {flag_descriptions::kEnableUseZoomForDsfChoiceDisabled,
675 switches::kEnableUseZoomForDSF, "false"}, 697 switches::kEnableUseZoomForDSF, "false"},
676 }; 698 };
677 699
678 const FeatureEntry::Choice kEnableWebFontsInterventionV2Choices[] = { 700 const FeatureEntry::Choice kEnableWebFontsInterventionV2Choices[] = {
679 {flag_descriptions::kEnableWebfontsInterventionV2ChoiceDefault, "", ""}, 701 {flag_descriptions::kEnableWebfontsInterventionV2ChoiceDefault, "", ""},
(...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after
2147 ENABLE_DISABLE_VALUE_TYPE( 2169 ENABLE_DISABLE_VALUE_TYPE(
2148 autofill::switches::kEnableOfferUploadCreditCards, 2170 autofill::switches::kEnableOfferUploadCreditCards,
2149 autofill::switches::kDisableOfferUploadCreditCards)}, 2171 autofill::switches::kDisableOfferUploadCreditCards)},
2150 #endif // TOOLKIT_VIEWS || OS_ANDROID 2172 #endif // TOOLKIT_VIEWS || OS_ANDROID
2151 #if defined(OS_ANDROID) 2173 #if defined(OS_ANDROID)
2152 {"tab-management-experiment-type", 2174 {"tab-management-experiment-type",
2153 flag_descriptions::kHerbPrototypeChoicesName, 2175 flag_descriptions::kHerbPrototypeChoicesName,
2154 flag_descriptions::kHerbPrototypeChoicesDescription, kOsAndroid, 2176 flag_descriptions::kHerbPrototypeChoicesDescription, kOsAndroid,
2155 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, 2177 MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
2156 #endif // OS_ANDROID 2178 #endif // OS_ANDROID
2179 #if defined(OS_ANDROID)
2180 {"omnibox-placeholder-experiment",
2181 flag_descriptions::kOmniboxPlaceholderExperimentName,
2182 flag_descriptions::kOmniboxPlaceholderExperimentDescription, kOsAndroid,
2183 MULTI_VALUE_TYPE(kOmniboxPlaceholderExperimentChoices)},
2184 #endif // OS_ANDROID
2157 {"enable-md-bookmarks", 2185 {"enable-md-bookmarks",
2158 flag_descriptions::kEnableMaterialDesignBookmarksName, 2186 flag_descriptions::kEnableMaterialDesignBookmarksName,
2159 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop, 2187 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop,
2160 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, 2188 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)},
2161 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName, 2189 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName,
2162 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop, 2190 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop,
2163 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, 2191 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)},
2164 {"enable-md-incognito-ntp", 2192 {"enable-md-incognito-ntp",
2165 flag_descriptions::kMaterialDesignIncognitoNTPName, 2193 flag_descriptions::kMaterialDesignIncognitoNTPName,
2166 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsDesktop, 2194 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsDesktop,
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
3161 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3189 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3162 3190
3163 const FeatureEntry* GetFeatureEntries(size_t* count) { 3191 const FeatureEntry* GetFeatureEntries(size_t* count) {
3164 *count = arraysize(kFeatureEntries); 3192 *count = arraysize(kFeatureEntries);
3165 return kFeatureEntries; 3193 return kFeatureEntries;
3166 } 3194 }
3167 3195
3168 } // namespace testing 3196 } // namespace testing
3169 3197
3170 } // namespace about_flags 3198 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698