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

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

Issue 379673003: Revert of Remove disable-app-list-voice-search flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/app_list/app_list_switches.h » ('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 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after
1514 }, 1514 },
1515 #endif 1515 #endif
1516 { 1516 {
1517 "disable-app-list-app-info", 1517 "disable-app-list-app-info",
1518 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, 1518 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1519 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1519 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1520 kOsLinux | kOsWin | kOsCrOS, 1520 kOsLinux | kOsWin | kOsCrOS,
1521 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1521 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1522 }, 1522 },
1523 { 1523 {
1524 "disable-app-list-voice-search",
1525 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1526 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1527 kOsCrOS,
1528 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1529 },
1530 {
1524 "enable-drive-apps-in-app-list", 1531 "enable-drive-apps-in-app-list",
1525 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME, 1532 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1526 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION, 1533 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1527 kOsDesktop, 1534 kOsDesktop,
1528 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList) 1535 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList)
1529 }, 1536 },
1530 #endif 1537 #endif
1531 #if defined(OS_ANDROID) 1538 #if defined(OS_ANDROID)
1532 { 1539 {
1533 "enable-accessibility-tab-switcher", 1540 "enable-accessibility-tab-switcher",
(...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
2467 } 2474 }
2468 2475
2469 const Experiment* GetExperiments(size_t* count) { 2476 const Experiment* GetExperiments(size_t* count) {
2470 *count = num_experiments; 2477 *count = num_experiments;
2471 return experiments; 2478 return experiments;
2472 } 2479 }
2473 2480
2474 } // namespace testing 2481 } // namespace testing
2475 2482
2476 } // namespace about_flags 2483 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | ui/app_list/app_list_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698