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

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

Issue 882343004: Enable the new bookmark apps system by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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') | chrome/browser/chrome_content_browser_client.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 1495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 #if defined(OS_CHROMEOS) 1506 #if defined(OS_CHROMEOS)
1507 { 1507 {
1508 "enable-first-run-ui-transitions", 1508 "enable-first-run-ui-transitions",
1509 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME, 1509 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME,
1510 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION, 1510 IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION,
1511 kOsCrOS, 1511 kOsCrOS,
1512 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions) 1512 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)
1513 }, 1513 },
1514 #endif 1514 #endif
1515 { 1515 {
1516 "enable-new-bookmark-apps", 1516 "disable-new-bookmark-apps",
1517 IDS_FLAGS_ENABLE_NEW_BOOKMARK_APPS_NAME, 1517 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_NAME,
1518 IDS_FLAGS_ENABLE_NEW_BOOKMARK_APPS_DESCRIPTION, 1518 IDS_FLAGS_DISABLE_NEW_BOOKMARK_APPS_DESCRIPTION,
1519 kOsWin | kOsCrOS | kOsLinux | kOsMac, 1519 kOsWin | kOsCrOS | kOsLinux | kOsMac,
1520 SINGLE_VALUE_TYPE(switches::kEnableNewBookmarkApps) 1520 SINGLE_VALUE_TYPE(switches::kDisableNewBookmarkApps)
1521 }, 1521 },
1522 #if defined(OS_MACOSX) 1522 #if defined(OS_MACOSX)
1523 { 1523 {
1524 "enable-hosted-app-shim-creation", 1524 "enable-hosted-app-shim-creation",
1525 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME, 1525 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_NAME,
1526 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION, 1526 IDS_FLAGS_ENABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION,
1527 kOsMac, 1527 kOsMac,
1528 SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation) 1528 SINGLE_VALUE_TYPE(switches::kEnableHostedAppShimCreation)
1529 }, 1529 },
1530 { 1530 {
(...skipping 1201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2732 } 2732 }
2733 2733
2734 const Experiment* GetExperiments(size_t* count) { 2734 const Experiment* GetExperiments(size_t* count) {
2735 *count = num_experiments; 2735 *count = num_experiments;
2736 return experiments; 2736 return experiments;
2737 } 2737 }
2738 2738
2739 } // namespace testing 2739 } // namespace testing
2740 2740
2741 } // namespace about_flags 2741 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698