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

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

Issue 556403002: cros: Enable Drive apps integration in app launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restore enable-drive-apps-in-app-list in histograms.xml Created 6 years, 3 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
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 1458 matching lines...) Expand 10 before | Expand all | Expand 10 after
1469 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppView) 1469 SINGLE_VALUE_TYPE(extensions::switches::kEnableAppView)
1470 }, 1470 },
1471 { 1471 {
1472 "disable-app-list-app-info", 1472 "disable-app-list-app-info",
1473 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, 1473 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1474 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1474 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1475 kOsLinux | kOsWin | kOsCrOS, 1475 kOsLinux | kOsWin | kOsCrOS,
1476 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1476 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1477 }, 1477 },
1478 { 1478 {
1479 "enable-drive-apps-in-app-list", 1479 "disable-drive-apps-in-app-list",
1480 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_NAME, 1480 IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1481 IDS_FLAGS_ENABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION, 1481 IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1482 kOsDesktop, 1482 kOsCrOS,
1483 SINGLE_VALUE_TYPE(app_list::switches::kEnableDriveAppsInAppList) 1483 SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList)
1484 }, 1484 },
1485 #endif 1485 #endif
1486 #if defined(OS_ANDROID) 1486 #if defined(OS_ANDROID)
1487 { 1487 {
1488 "enable-accessibility-tab-switcher", 1488 "enable-accessibility-tab-switcher",
1489 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1489 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1490 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1490 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1491 kOsAndroid, 1491 kOsAndroid,
1492 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1492 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1493 }, 1493 },
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
2477 } 2477 }
2478 2478
2479 const Experiment* GetExperiments(size_t* count) { 2479 const Experiment* GetExperiments(size_t* count) {
2480 *count = num_experiments; 2480 *count = num_experiments;
2481 return experiments; 2481 return experiments;
2482 } 2482 }
2483 2483
2484 } // namespace testing 2484 } // namespace testing
2485 2485
2486 } // namespace about_flags 2486 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/apps/drive/drive_app_provider_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698