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

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

Issue 139293007: Flag-flip of app-list-voice-search. Now it's on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/app_list/start_page_service.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 <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1740 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage) 1740 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage)
1741 }, 1741 },
1742 { 1742 {
1743 "enable-app-list-folder", 1743 "enable-app-list-folder",
1744 IDS_FLAGS_ENABLE_APP_LIST_FOLDER, 1744 IDS_FLAGS_ENABLE_APP_LIST_FOLDER,
1745 IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION, 1745 IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION,
1746 kOsWin | kOsCrOS, 1746 kOsWin | kOsCrOS,
1747 SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI) 1747 SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI)
1748 }, 1748 },
1749 { 1749 {
1750 "enable-app-list-voice-search", 1750 "disable-app-list-voice-search",
1751 IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH, 1751 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1752 IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, 1752 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1753 kOsCrOS, 1753 kOsCrOS,
1754 SINGLE_VALUE_TYPE(app_list::switches::kEnableVoiceSearch) 1754 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1755 }, 1755 },
1756 #endif 1756 #endif
1757 #if defined(OS_CHROMEOS) 1757 #if defined(OS_CHROMEOS)
1758 { 1758 {
1759 "disable-user-image-sync", 1759 "disable-user-image-sync",
1760 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME, 1760 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME,
1761 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION, 1761 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION,
1762 kOsCrOS, 1762 kOsCrOS,
1763 SINGLE_VALUE_TYPE(chromeos::switches::kDisableUserImageSync) 1763 SINGLE_VALUE_TYPE(chromeos::switches::kDisableUserImageSync)
1764 }, 1764 },
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
2473 } 2473 }
2474 2474
2475 const Experiment* GetExperiments(size_t* count) { 2475 const Experiment* GetExperiments(size_t* count) {
2476 *count = num_experiments; 2476 *count = num_experiments;
2477 return experiments; 2477 return experiments;
2478 } 2478 }
2479 2479
2480 } // namespace testing 2480 } // namespace testing
2481 2481
2482 } // namespace about_flags 2482 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/app_list/start_page_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698