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

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

Issue 2965173002: Add ContextualSuggestionsService to Omnibox (Closed)
Patch Set: Created 3 years, 5 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 23 matching lines...) Expand all
34 #include "chrome/common/chrome_content_client.h" 34 #include "chrome/common/chrome_content_client.h"
35 #include "chrome/common/chrome_features.h" 35 #include "chrome/common/chrome_features.h"
36 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
37 #include "chrome/common/features.h" 37 #include "chrome/common/features.h"
38 #include "chrome/common/pause_tabs_field_trial.h" 38 #include "chrome/common/pause_tabs_field_trial.h"
39 #include "components/autofill/core/browser/autofill_experiments.h" 39 #include "components/autofill/core/browser/autofill_experiments.h"
40 #include "components/autofill/core/common/autofill_switches.h" 40 #include "components/autofill/core/common/autofill_switches.h"
41 #include "components/autofill/core/common/autofill_util.h" 41 #include "components/autofill/core/common/autofill_util.h"
42 #include "components/browser_sync/browser_sync_switches.h" 42 #include "components/browser_sync/browser_sync_switches.h"
43 #include "components/cloud_devices/common/cloud_devices_switches.h" 43 #include "components/cloud_devices/common/cloud_devices_switches.h"
44 #include "components/contextual_suggestions/features.h"
44 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_featu res.h" 45 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_featu res.h"
45 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h" 46 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switc hes.h"
46 #include "components/dom_distiller/core/dom_distiller_switches.h" 47 #include "components/dom_distiller/core/dom_distiller_switches.h"
47 #include "components/error_page/common/error_page_switches.h" 48 #include "components/error_page/common/error_page_switches.h"
48 #include "components/favicon/core/features.h" 49 #include "components/favicon/core/features.h"
49 #include "components/feature_engagement_tracker/public/feature_constants.h" 50 #include "components/feature_engagement_tracker/public/feature_constants.h"
50 #include "components/feature_engagement_tracker/public/feature_list.h" 51 #include "components/feature_engagement_tracker/public/feature_list.h"
51 #include "components/flags_ui/feature_entry.h" 52 #include "components/flags_ui/feature_entry.h"
52 #include "components/flags_ui/feature_entry_macros.h" 53 #include "components/flags_ui/feature_entry_macros.h"
53 #include "components/flags_ui/flags_storage.h" 54 #include "components/flags_ui/flags_storage.h"
(...skipping 2796 matching lines...) Expand 10 before | Expand all | Expand 10 after
2850 flag_descriptions::kEnableTouchSupportForScreenMagnifierName, 2851 flag_descriptions::kEnableTouchSupportForScreenMagnifierName,
2851 flag_descriptions::kEnableTouchSupportForScreenMagnifierDescription, 2852 flag_descriptions::kEnableTouchSupportForScreenMagnifierDescription,
2852 kOsCrOS, 2853 kOsCrOS,
2853 SINGLE_VALUE_TYPE( 2854 SINGLE_VALUE_TYPE(
2854 chromeos::switches::kEnableTouchSupportForScreenMagnifier)}, 2855 chromeos::switches::kEnableTouchSupportForScreenMagnifier)},
2855 #endif // OS_CHROMEOS 2856 #endif // OS_CHROMEOS
2856 2857
2857 {"enable-zero-suggest-redirect-to-chrome", 2858 {"enable-zero-suggest-redirect-to-chrome",
2858 flag_descriptions::kEnableZeroSuggestRedirectToChromeName, 2859 flag_descriptions::kEnableZeroSuggestRedirectToChromeName,
2859 flag_descriptions::kEnableZeroSuggestRedirectToChromeDescription, kOsAll, 2860 flag_descriptions::kEnableZeroSuggestRedirectToChromeDescription, kOsAll,
2860 FEATURE_VALUE_TYPE(omnibox::kZeroSuggestRedirectToChrome)}, 2861 FEATURE_VALUE_TYPE(features::kZeroSuggestRedirectToChrome)},
2861 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName, 2862 {"new-omnibox-answer-types", flag_descriptions::kNewOmniboxAnswerTypesName,
2862 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll, 2863 flag_descriptions::kNewOmniboxAnswerTypesDescription, kOsAll,
2863 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)}, 2864 FEATURE_VALUE_TYPE(omnibox::kNewOmniboxAnswerTypes)},
2864 2865
2865 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \ 2866 #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_MACOSX) || \
2866 defined(OS_WIN) 2867 defined(OS_WIN)
2867 {"omnibox-entity-suggestions", 2868 {"omnibox-entity-suggestions",
2868 flag_descriptions::kOmniboxEntitySuggestionsName, 2869 flag_descriptions::kOmniboxEntitySuggestionsName,
2869 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop, 2870 flag_descriptions::kOmniboxEntitySuggestionsDescription, kOsDesktop,
2870 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)}, 2871 FEATURE_VALUE_TYPE(omnibox::kOmniboxEntitySuggestions)},
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
3356 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 3357 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
3357 3358
3358 const FeatureEntry* GetFeatureEntries(size_t* count) { 3359 const FeatureEntry* GetFeatureEntries(size_t* count) {
3359 *count = arraysize(kFeatureEntries); 3360 *count = arraysize(kFeatureEntries);
3360 return kFeatureEntries; 3361 return kFeatureEntries;
3361 } 3362 }
3362 3363
3363 } // namespace testing 3364 } // namespace testing
3364 3365
3365 } // namespace about_flags 3366 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698