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

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

Issue 2903293002: [Android] Omnibox Placeholder Experiment (Closed)
Patch Set: fix some naming issues Created 3 years, 6 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 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 #if defined(OS_ANDROID) 668 #if defined(OS_ANDROID)
669 const FeatureEntry::Choice kHerbPrototypeChoices[] = { 669 const FeatureEntry::Choice kHerbPrototypeChoices[] = {
670 {flags_ui::kGenericExperimentChoiceDefault, "", ""}, 670 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
671 {flags_ui::kGenericExperimentChoiceDisabled, 671 {flags_ui::kGenericExperimentChoiceDisabled,
672 switches::kTabManagementExperimentTypeDisabled, ""}, 672 switches::kTabManagementExperimentTypeDisabled, ""},
673 {flag_descriptions::kHerbPrototypeFlavorElderberry, 673 {flag_descriptions::kHerbPrototypeFlavorElderberry,
674 switches::kTabManagementExperimentTypeElderberry, ""}, 674 switches::kTabManagementExperimentTypeElderberry, ""},
675 }; 675 };
676 #endif // OS_ANDROID 676 #endif // OS_ANDROID
677 677
678 #if defined(OS_ANDROID)
679 const FeatureEntry::Choice kOmniboxPlaceholderExperimentChoices[] = {
Ted C 2017/05/30 22:14:28 From the bug, it mentions that we don't need somet
huayinz 2017/05/30 23:10:30 AFAIK I can only override finch config on user deb
680 {flags_ui::kGenericExperimentChoiceDefault, "", ""},
681 {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeUrl,
682 switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeUrl"},
683 {flag_descriptions::kOmniboxPlaceholderExperimentSearchOrTypeWebsiteName,
684 switches::kOmniboxPlaceholderExperimentSwitch, "SearchOrTypeWebsiteName"},
685 {flag_descriptions::kOmniboxPlaceholderExperimentSearchTheWeb,
686 switches::kOmniboxPlaceholderExperimentSwitch, "SearchTheWeb"},
687 {flag_descriptions::kOmniboxPlaceholderExperimentEnterASearchOrWebsite,
688 switches::kOmniboxPlaceholderExperimentSwitch, "EnterASearchOrWebsite"},
689 {flag_descriptions::kOmniboxPlaceholderExperimentSearchNews,
690 switches::kOmniboxPlaceholderExperimentSwitch, "SearchNews"},
691 {flag_descriptions::kOmniboxPlaceholderExperimentSearchRecipes,
692 switches::kOmniboxPlaceholderExperimentSwitch, "SearchRecipes"},
693 {flag_descriptions::kOmniboxPlaceholderExperimentSearchWeather,
694 switches::kOmniboxPlaceholderExperimentSwitch, "SearchWeather"},
695 {flag_descriptions::kOmniboxPlaceholderExperimentBlank,
696 switches::kOmniboxPlaceholderExperimentSwitch, "Blank"},
697 };
698 #endif // OS_ANDROID
699
678 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = { 700 const FeatureEntry::Choice kEnableUseZoomForDSFChoices[] = {
679 {flag_descriptions::kEnableUseZoomForDsfChoiceDefault, "", ""}, 701 {flag_descriptions::kEnableUseZoomForDsfChoiceDefault, "", ""},
680 {flag_descriptions::kEnableUseZoomForDsfChoiceEnabled, 702 {flag_descriptions::kEnableUseZoomForDsfChoiceEnabled,
681 switches::kEnableUseZoomForDSF, "true"}, 703 switches::kEnableUseZoomForDSF, "true"},
682 {flag_descriptions::kEnableUseZoomForDsfChoiceDisabled, 704 {flag_descriptions::kEnableUseZoomForDsfChoiceDisabled,
683 switches::kEnableUseZoomForDSF, "false"}, 705 switches::kEnableUseZoomForDSF, "false"},
684 }; 706 };
685 707
686 const FeatureEntry::Choice kEnableWebFontsInterventionV2Choices[] = { 708 const FeatureEntry::Choice kEnableWebFontsInterventionV2Choices[] = {
687 {flag_descriptions::kEnableWebfontsInterventionV2ChoiceDefault, "", ""}, 709 {flag_descriptions::kEnableWebfontsInterventionV2ChoiceDefault, "", ""},
(...skipping 1506 matching lines...) Expand 10 before | Expand all | Expand 10 after
2194 ENABLE_DISABLE_VALUE_TYPE( 2216 ENABLE_DISABLE_VALUE_TYPE(
2195 autofill::switches::kEnableOfferUploadCreditCards, 2217 autofill::switches::kEnableOfferUploadCreditCards,
2196 autofill::switches::kDisableOfferUploadCreditCards)}, 2218 autofill::switches::kDisableOfferUploadCreditCards)},
2197 #endif // TOOLKIT_VIEWS || OS_ANDROID 2219 #endif // TOOLKIT_VIEWS || OS_ANDROID
2198 #if defined(OS_ANDROID) 2220 #if defined(OS_ANDROID)
2199 {"tab-management-experiment-type", 2221 {"tab-management-experiment-type",
2200 flag_descriptions::kHerbPrototypeChoicesName, 2222 flag_descriptions::kHerbPrototypeChoicesName,
2201 flag_descriptions::kHerbPrototypeChoicesDescription, kOsAndroid, 2223 flag_descriptions::kHerbPrototypeChoicesDescription, kOsAndroid,
2202 MULTI_VALUE_TYPE(kHerbPrototypeChoices)}, 2224 MULTI_VALUE_TYPE(kHerbPrototypeChoices)},
2203 #endif // OS_ANDROID 2225 #endif // OS_ANDROID
2226 #if defined(OS_ANDROID)
2227 {"omnibox-placeholder-experiment",
2228 flag_descriptions::kOmniboxPlaceholderExperimentName,
2229 flag_descriptions::kOmniboxPlaceholderExperimentDescription, kOsAndroid,
2230 MULTI_VALUE_TYPE(kOmniboxPlaceholderExperimentChoices)},
2231 #endif // OS_ANDROID
2204 {"enable-md-bookmarks", 2232 {"enable-md-bookmarks",
2205 flag_descriptions::kEnableMaterialDesignBookmarksName, 2233 flag_descriptions::kEnableMaterialDesignBookmarksName,
2206 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop, 2234 flag_descriptions::kEnableMaterialDesignBookmarksDescription, kOsDesktop,
2207 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)}, 2235 FEATURE_VALUE_TYPE(features::kMaterialDesignBookmarks)},
2208 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName, 2236 {"enable-md-feedback", flag_descriptions::kEnableMaterialDesignFeedbackName,
2209 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop, 2237 flag_descriptions::kEnableMaterialDesignFeedbackDescription, kOsDesktop,
2210 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)}, 2238 SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignFeedback)},
2211 {"enable-md-incognito-ntp", 2239 {"enable-md-incognito-ntp",
2212 flag_descriptions::kMaterialDesignIncognitoNTPName, 2240 flag_descriptions::kMaterialDesignIncognitoNTPName,
2213 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAll, 2241 flag_descriptions::kMaterialDesignIncognitoNTPDescription, kOsAll,
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
3236 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3264 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3237 3265
3238 const FeatureEntry* GetFeatureEntries(size_t* count) { 3266 const FeatureEntry* GetFeatureEntries(size_t* count) {
3239 *count = arraysize(kFeatureEntries); 3267 *count = arraysize(kFeatureEntries);
3240 return kFeatureEntries; 3268 return kFeatureEntries;
3241 } 3269 }
3242 3270
3243 } // namespace testing 3271 } // namespace testing
3244 3272
3245 } // namespace about_flags 3273 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698