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

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: move to c/b/apps, add OWNERS 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 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 kOsCrOS, 1430 kOsCrOS,
1431 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch) 1431 SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
1432 }, 1432 },
1433 { 1433 {
1434 "enable-app-list-app-info", 1434 "enable-app-list-app-info",
1435 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST, 1435 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST,
1436 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1436 IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1437 kOsLinux | kOsWin | kOsCrOS, 1437 kOsLinux | kOsWin | kOsCrOS,
1438 SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo) 1438 SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo)
1439 }, 1439 },
1440 {
1441 "enable-drive-apps-in-app-list",
1442 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1443 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1444 kOsDesktop,
1445 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList)
1446 },
1440 #endif 1447 #endif
1441 #if defined(OS_ANDROID) 1448 #if defined(OS_ANDROID)
1442 { 1449 {
1443 "enable-accessibility-tab-switcher", 1450 "enable-accessibility-tab-switcher",
1444 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1451 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1445 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1452 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1446 kOsAndroid, 1453 kOsAndroid,
1447 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1454 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1448 }, 1455 },
1449 { 1456 {
(...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
2341 } 2348 }
2342 2349
2343 const Experiment* GetExperiments(size_t* count) { 2350 const Experiment* GetExperiments(size_t* count) {
2344 *count = num_experiments; 2351 *count = num_experiments;
2345 return experiments; 2352 return experiments;
2346 } 2353 }
2347 2354
2348 } // namespace testing 2355 } // namespace testing
2349 2356
2350 } // namespace about_flags 2357 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698