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

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

Issue 634413002: app_list: Disable Drive app integration for M39. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove useless disable flag Created 6 years, 2 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/app_list/app_list_switches.cc » ('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 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 SINGLE_VALUE_TYPE(switches::kEnableAppList) 1472 SINGLE_VALUE_TYPE(switches::kEnableAppList)
1473 }, 1473 },
1474 #endif 1474 #endif
1475 { 1475 {
1476 "disable-app-list-app-info", 1476 "disable-app-list-app-info",
1477 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, 1477 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1478 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1478 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1479 kOsLinux | kOsWin | kOsCrOS, 1479 kOsLinux | kOsWin | kOsCrOS,
1480 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1480 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1481 }, 1481 },
1482 {
1483 "disable-drive-apps-in-app-list",
1484 IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_NAME,
1485 IDS_FLAGS_DISABLE_DRIVE_APPS_IN_APP_LIST_DESCRIPTION,
1486 kOsCrOS,
1487 SINGLE_VALUE_TYPE(app_list::switches::kDisableDriveAppsInAppList)
1488 },
1489 #endif 1482 #endif
1490 #if defined(OS_ANDROID) 1483 #if defined(OS_ANDROID)
1491 { 1484 {
1492 "enable-accessibility-tab-switcher", 1485 "enable-accessibility-tab-switcher",
1493 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME, 1486 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
1494 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION, 1487 IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
1495 kOsAndroid, 1488 kOsAndroid,
1496 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher) 1489 SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)
1497 }, 1490 },
1498 { 1491 {
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 } 2550 }
2558 2551
2559 const Experiment* GetExperiments(size_t* count) { 2552 const Experiment* GetExperiments(size_t* count) {
2560 *count = num_experiments; 2553 *count = num_experiments;
2561 return experiments; 2554 return experiments;
2562 } 2555 }
2563 2556
2564 } // namespace testing 2557 } // namespace testing
2565 2558
2566 } // namespace about_flags 2559 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/app_list/app_list_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698