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

Side by Side Diff: chrome/browser/chrome_content_browser_client.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/browser/about_flags.cc ('k') | chrome/browser/extensions/extension_util.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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 extensions::switches::kExtensionsOnChromeURLs, 1446 extensions::switches::kExtensionsOnChromeURLs,
1447 extensions::switches::kWhitelistedExtensionID, 1447 extensions::switches::kWhitelistedExtensionID,
1448 #endif 1448 #endif
1449 switches::kAppsCheckoutURL, 1449 switches::kAppsCheckoutURL,
1450 switches::kAppsGalleryURL, 1450 switches::kAppsGalleryURL,
1451 switches::kCloudPrintURL, 1451 switches::kCloudPrintURL,
1452 switches::kCloudPrintXmppEndpoint, 1452 switches::kCloudPrintXmppEndpoint,
1453 switches::kDisableBundledPpapiFlash, 1453 switches::kDisableBundledPpapiFlash,
1454 switches::kDisableCastStreamingHWEncoding, 1454 switches::kDisableCastStreamingHWEncoding,
1455 switches::kDisableJavaScriptHarmonyShipping, 1455 switches::kDisableJavaScriptHarmonyShipping,
1456 switches::kDisableNewBookmarkApps,
1456 switches::kDisableOutOfProcessPdf, 1457 switches::kDisableOutOfProcessPdf,
1457 switches::kEnableBenchmarking, 1458 switches::kEnableBenchmarking,
1458 switches::kEnableNaCl, 1459 switches::kEnableNaCl,
1459 #if !defined(DISABLE_NACL) 1460 #if !defined(DISABLE_NACL)
1460 switches::kEnableNaClDebug, 1461 switches::kEnableNaClDebug,
1461 switches::kEnableNaClNonSfiMode, 1462 switches::kEnableNaClNonSfiMode,
1462 #endif 1463 #endif
1463 switches::kEnableNetBenchmarking, 1464 switches::kEnableNetBenchmarking,
1464 switches::kEnableNewBookmarkApps,
1465 switches::kEnableOutOfProcessPdf, 1465 switches::kEnableOutOfProcessPdf,
1466 switches::kEnablePluginPlaceholderShadowDom, 1466 switches::kEnablePluginPlaceholderShadowDom,
1467 switches::kEnableShowModalDialog, 1467 switches::kEnableShowModalDialog,
1468 switches::kEnableWebBasedSignin, 1468 switches::kEnableWebBasedSignin,
1469 switches::kJavaScriptHarmony, 1469 switches::kJavaScriptHarmony,
1470 switches::kMessageLoopHistogrammer, 1470 switches::kMessageLoopHistogrammer,
1471 switches::kPlaybackMode, 1471 switches::kPlaybackMode,
1472 switches::kPpapiFlashArgs, 1472 switches::kPpapiFlashArgs,
1473 switches::kPpapiFlashPath, 1473 switches::kPpapiFlashPath,
1474 switches::kPpapiFlashVersion, 1474 switches::kPpapiFlashVersion,
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2609 switches::kDisableWebRtcEncryption, 2609 switches::kDisableWebRtcEncryption,
2610 }; 2610 };
2611 to_command_line->CopySwitchesFrom(from_command_line, 2611 to_command_line->CopySwitchesFrom(from_command_line,
2612 kWebRtcDevSwitchNames, 2612 kWebRtcDevSwitchNames,
2613 arraysize(kWebRtcDevSwitchNames)); 2613 arraysize(kWebRtcDevSwitchNames));
2614 } 2614 }
2615 } 2615 }
2616 #endif // defined(ENABLE_WEBRTC) 2616 #endif // defined(ENABLE_WEBRTC)
2617 2617
2618 } // namespace chrome 2618 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/extensions/extension_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698