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

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

Issue 774003002: [Hotword] Reverse the experimental flag so that it is on by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix browser test Created 6 years 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 1874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1885 { 1885 {
1886 "enable-data-reduction-proxy-alt", 1886 "enable-data-reduction-proxy-alt",
1887 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME, 1887 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_NAME,
1888 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION, 1888 IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_ALTERNATIVE_DESCRIPTION,
1889 kOsAndroid, 1889 kOsAndroid,
1890 SINGLE_VALUE_TYPE( 1890 SINGLE_VALUE_TYPE(
1891 data_reduction_proxy::switches::kEnableDataReductionProxyAlt) 1891 data_reduction_proxy::switches::kEnableDataReductionProxyAlt)
1892 }, 1892 },
1893 #endif 1893 #endif
1894 { 1894 {
1895 "enable-experimental-hotwording", 1895 "disable-experimental-hotwording",
1896 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_NAME, 1896 IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_NAME,
1897 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION, 1897 IDS_FLAGS_DISABLE_EXPERIMENTAL_HOTWORDING_DESCRIPTION,
1898 kOsDesktop, 1898 kOsDesktop,
1899 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwording) 1899 SINGLE_VALUE_TYPE(switches::kDisableExperimentalHotwording)
1900 }, 1900 },
1901 { 1901 {
1902 "enable-hotword-hardware", 1902 "enable-hotword-hardware",
1903 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME, 1903 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
1904 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION, 1904 IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION,
1905 kOsCrOS, 1905 kOsCrOS,
1906 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware) 1906 SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)
1907 }, 1907 },
1908 #if defined(ENABLE_EXTENSIONS) 1908 #if defined(ENABLE_EXTENSIONS)
1909 { 1909 {
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 } 2622 }
2623 2623
2624 const Experiment* GetExperiments(size_t* count) { 2624 const Experiment* GetExperiments(size_t* count) {
2625 *count = num_experiments; 2625 *count = num_experiments;
2626 return experiments; 2626 return experiments;
2627 } 2627 }
2628 2628
2629 } // namespace testing 2629 } // namespace testing
2630 2630
2631 } // namespace about_flags 2631 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698