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

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

Issue 2765083002: Hardcode extensions::util::IsNewBookmarkAppsEnabled() to true, except on Mac. (Closed)
Patch Set: respond to comments Created 3 years, 9 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 | « no previous file | chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm » ('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 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 #endif // OS_ANDROID 1334 #endif // OS_ANDROID
1335 {"enable-zero-copy", IDS_FLAGS_ZERO_COPY_NAME, 1335 {"enable-zero-copy", IDS_FLAGS_ZERO_COPY_NAME,
1336 IDS_FLAGS_ZERO_COPY_DESCRIPTION, kOsAll, 1336 IDS_FLAGS_ZERO_COPY_DESCRIPTION, kOsAll,
1337 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy, 1337 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy,
1338 switches::kDisableZeroCopy)}, 1338 switches::kDisableZeroCopy)},
1339 #if defined(OS_CHROMEOS) 1339 #if defined(OS_CHROMEOS)
1340 {"enable-first-run-ui-transitions", IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME, 1340 {"enable-first-run-ui-transitions", IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME,
1341 IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, kOsCrOS, 1341 IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, kOsCrOS,
1342 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)}, 1342 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)},
1343 #endif // OS_CHROMEOS 1343 #endif // OS_CHROMEOS
1344 {"disable-new-bookmark-apps", IDS_FLAGS_NEW_BOOKMARK_APPS_NAME,
1345 IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION,
1346 kOsWin | kOsCrOS | kOsLinux | kOsMac,
1347 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewBookmarkApps,
1348 switches::kDisableNewBookmarkApps)},
1349 #if defined(OS_MACOSX) 1344 #if defined(OS_MACOSX)
1345 {"bookmark-apps", IDS_FLAGS_NEW_BOOKMARK_APPS_NAME,
1346 IDS_FLAGS_NEW_BOOKMARK_APPS_DESCRIPTION, kOsMac,
1347 FEATURE_VALUE_TYPE(features::kBookmarkApps)},
1350 {"disable-hosted-apps-in-windows", IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_NAME, 1348 {"disable-hosted-apps-in-windows", IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_NAME,
1351 IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_DESCRIPTION, kOsMac, 1349 IDS_FLAGS_HOSTED_APPS_IN_WINDOWS_DESCRIPTION, kOsMac,
1352 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHostedAppsInWindows, 1350 ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHostedAppsInWindows,
1353 switches::kDisableHostedAppsInWindows)}, 1351 switches::kDisableHostedAppsInWindows)},
1354 {"disable-hosted-app-shim-creation", 1352 {"disable-hosted-app-shim-creation",
1355 IDS_FLAGS_HOSTED_APP_SHIM_CREATION_NAME, 1353 IDS_FLAGS_HOSTED_APP_SHIM_CREATION_NAME,
1356 IDS_FLAGS_HOSTED_APP_SHIM_CREATION_DESCRIPTION, kOsMac, 1354 IDS_FLAGS_HOSTED_APP_SHIM_CREATION_DESCRIPTION, kOsMac,
1357 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)}, 1355 SINGLE_DISABLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)},
1358 {"enable-hosted-app-quit-notification", 1356 {"enable-hosted-app-quit-notification",
1359 IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_NAME, 1357 IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_NAME,
(...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after
2526 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2524 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2527 2525
2528 const FeatureEntry* GetFeatureEntries(size_t* count) { 2526 const FeatureEntry* GetFeatureEntries(size_t* count) {
2529 *count = arraysize(kFeatureEntries); 2527 *count = arraysize(kFeatureEntries);
2530 return kFeatureEntries; 2528 return kFeatureEntries;
2531 } 2529 }
2532 2530
2533 } // namespace testing 2531 } // namespace testing
2534 2532
2535 } // namespace about_flags 2533 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698