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

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

Issue 135843004: Flag-flip of app-list-voice-search (2) (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 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1742 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage) 1742 SINGLE_VALUE_TYPE(switches::kShowAppListStartPage)
1743 }, 1743 },
1744 { 1744 {
1745 "enable-app-list-folder", 1745 "enable-app-list-folder",
1746 IDS_FLAGS_ENABLE_APP_LIST_FOLDER, 1746 IDS_FLAGS_ENABLE_APP_LIST_FOLDER,
1747 IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION, 1747 IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION,
1748 kOsWin | kOsCrOS, 1748 kOsWin | kOsCrOS,
1749 SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI) 1749 SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI)
1750 }, 1750 },
1751 { 1751 {
1752 "enable-app-list-voice-search", 1752 "disable-app-list-voice-search",
1753 IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH, 1753 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1754 IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, 1754 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1755 kOsCrOS, 1755 kOsCrOS,
1756 SINGLE_VALUE_TYPE(app_list::switches::kEnableVoiceSearch) 1756 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1757 }, 1757 },
1758 #endif 1758 #endif
1759 #if defined(OS_CHROMEOS) 1759 #if defined(OS_CHROMEOS)
1760 { 1760 {
1761 "disable-user-image-sync", 1761 "disable-user-image-sync",
1762 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME, 1762 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_NAME,
1763 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION, 1763 IDS_FLAGS_DISABLE_USER_IMAGE_SYNC_DESCRIPTION,
1764 kOsCrOS, 1764 kOsCrOS,
1765 SINGLE_VALUE_TYPE(chromeos::switches::kDisableUserImageSync) 1765 SINGLE_VALUE_TYPE(chromeos::switches::kDisableUserImageSync)
1766 }, 1766 },
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
2475 } 2475 }
2476 2476
2477 const Experiment* GetExperiments(size_t* count) { 2477 const Experiment* GetExperiments(size_t* count) {
2478 *count = num_experiments; 2478 *count = num_experiments;
2479 return experiments; 2479 return experiments;
2480 } 2480 }
2481 2481
2482 } // namespace testing 2482 } // namespace testing
2483 2483
2484 } // namespace about_flags 2484 } // 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