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

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

Issue 981773003: Remove the flag to disable new hotwording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/hotword_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 { 1928 {
1929 "enable-data-reduction-proxy-alt", 1929 "enable-data-reduction-proxy-alt",
1930 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME, 1930 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
1931 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION, 1931 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
1932 kOsAndroid, 1932 kOsAndroid,
1933 SINGLE_VALUE_TYPE( 1933 SINGLE_VALUE_TYPE(
1934 data_reduction_proxy::switches::kEnableDataReductionProxyAlt) 1934 data_reduction_proxy::switches::kEnableDataReductionProxyAlt)
1935 }, 1935 },
1936 #endif 1936 #endif
1937 { 1937 {
1938 "disable-experimental-hotwording",
1939 IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_NAME,
1940 IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION,
1941 kOsDesktop,
1942 SINGLE_VALUE_TYPE(switches::kDisableExperimentalHotwording)
1943 },
1944 {
1945 "enable-hotword-hardware", 1938 "enable-hotword-hardware",
1946 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, 1939 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
1947 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, 1940 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION,
1948 kOsCrOS, 1941 kOsCrOS,
1949 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware) 1942 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)
1950 }, 1943 },
1951 #if defined(ENABLE_EXTENSIONS) 1944 #if defined(ENABLE_EXTENSIONS)
1952 { 1945 {
1953 "enable-embedded-extension-options", 1946 "enable-embedded-extension-options",
1954 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME, 1947 IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME,
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
2871 } 2864 }
2872 2865
2873 const Experiment* GetExperiments(size_t* count) { 2866 const Experiment* GetExperiments(size_t* count) {
2874 *count = num_experiments; 2867 *count = num_experiments;
2875 return experiments; 2868 return experiments;
2876 } 2869 }
2877 2870
2878 } // namespace testing 2871 } // namespace testing
2879 2872
2880 } // namespace about_flags 2873 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/hotword_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698