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

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

Issue 308003005: app_list: Drive app integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, fix nits Created 6 years, 6 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
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 1498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1509 kOsLinux | kOsWin | kOsCrOS, 1509 kOsLinux | kOsWin | kOsCrOS,
1510 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1510 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1511 }, 1511 },
1512 { 1512 {
1513 "disable-app-list-voice-search", 1513 "disable-app-list-voice-search",
1514 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, 1514 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1515 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, 1515 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1516 kOsCrOS, 1516 kOsCrOS,
1517 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) 1517 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1518 }, 1518 },
1519 {
1520 "enable-drive-apps-in-app-list",
1521 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1522 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1523 kOsDesktop,
1524 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList)
1525 },
1519 #endif 1526 #endif
1520 #if defined(OS_ANDROID) 1527 #if defined(OS_ANDROID)
1521 { 1528 {
1522 "enable-accessibility-tab-switcher", 1529 "enable-accessibility-tab-switcher",
1523 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1530 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1524 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1531 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1525 kOsAndroid, 1532 kOsAndroid,
1526 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1533 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1527 }, 1534 },
1528 { 1535 {
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
2463 } 2470 }
2464 2471
2465 const Experiment* GetExperiments(size_t* count) { 2472 const Experiment* GetExperiments(size_t* count) {
2466 *count = num_experiments; 2473 *count = num_experiments;
2467 return experiments; 2474 return experiments;
2468 } 2475 }
2469 2476
2470 } // namespace testing 2477 } // namespace testing
2471 2478
2472 } // namespace about_flags 2479 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698