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

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 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/apps/drive/OWNERS » ('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 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1500 kOsLinux | kOsWin | kOsCrOS, 1500 kOsLinux | kOsWin | kOsCrOS,
1501 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1501 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1502 }, 1502 },
1503 { 1503 {
1504 "disable-app-list-voice-search", 1504 "disable-app-list-voice-search",
1505 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH, 1505 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
1506 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION, 1506 IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
1507 kOsCrOS, 1507 kOsCrOS,
1508 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) 1508 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1509 }, 1509 },
1510 {
1511 "enable-drive-apps-in-app-list",
1512 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1513 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1514 kOsDesktop,
1515 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList)
1516 },
1510 #endif 1517 #endif
1511 #if defined(OS_ANDROID) 1518 #if defined(OS_ANDROID)
1512 { 1519 {
1513 "enable-accessibility-tab-switcher", 1520 "enable-accessibility-tab-switcher",
1514 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1521 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1515 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1522 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1516 kOsAndroid, 1523 kOsAndroid,
1517 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1524 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1518 }, 1525 },
1519 { 1526 {
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
2454 } 2461 }
2455 2462
2456 const Experiment* GetExperiments(size_t* count) { 2463 const Experiment* GetExperiments(size_t* count) {
2457 *count = num_experiments; 2464 *count = num_experiments;
2458 return experiments; 2465 return experiments;
2459 } 2466 }
2460 2467
2461 } // namespace testing 2468 } // namespace testing
2462 2469
2463 } // namespace about_flags 2470 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/apps/drive/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698