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

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

Issue 772533005: Enable the new bookmark apps system by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update one more test Created 6 years 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/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 1355 matching lines...) Expand 10 before | Expand all | Expand 10 after
1366 extensions::switches::kExtensionsOnChromeURLs, 1366 extensions::switches::kExtensionsOnChromeURLs,
1367 extensions::switches::kWhitelistedExtensionID, 1367 extensions::switches::kWhitelistedExtensionID,
1368 #endif 1368 #endif
1369 switches::kAppsCheckoutURL, 1369 switches::kAppsCheckoutURL,
1370 switches::kAppsGalleryURL, 1370 switches::kAppsGalleryURL,
1371 switches::kCloudPrintURL, 1371 switches::kCloudPrintURL,
1372 switches::kCloudPrintXmppEndpoint, 1372 switches::kCloudPrintXmppEndpoint,
1373 switches::kDisableBundledPpapiFlash, 1373 switches::kDisableBundledPpapiFlash,
1374 switches::kDisableCastStreamingHWEncoding, 1374 switches::kDisableCastStreamingHWEncoding,
1375 switches::kDisableJavaScriptHarmonyShipping, 1375 switches::kDisableJavaScriptHarmonyShipping,
1376 switches::kDisableNewBookmarkApps,
1376 switches::kDisableOutOfProcessPdf, 1377 switches::kDisableOutOfProcessPdf,
1377 switches::kEnableBenchmarking, 1378 switches::kEnableBenchmarking,
1378 switches::kEnableNaCl, 1379 switches::kEnableNaCl,
1379 #if !defined(DISABLE_NACL) 1380 #if !defined(DISABLE_NACL)
1380 switches::kEnableNaClDebug, 1381 switches::kEnableNaClDebug,
1381 switches::kEnableNaClNonSfiMode, 1382 switches::kEnableNaClNonSfiMode,
1382 #endif 1383 #endif
1383 switches::kEnableNetBenchmarking, 1384 switches::kEnableNetBenchmarking,
1384 switches::kEnableOutOfProcessPdf, 1385 switches::kEnableOutOfProcessPdf,
1385 switches::kEnablePluginPlaceholderShadowDom, 1386 switches::kEnablePluginPlaceholderShadowDom,
1386 switches::kEnableShowModalDialog, 1387 switches::kEnableShowModalDialog,
1387 switches::kEnableStreamlinedHostedApps,
1388 switches::kEnableWebBasedSignin, 1388 switches::kEnableWebBasedSignin,
1389 switches::kJavaScriptHarmony, 1389 switches::kJavaScriptHarmony,
1390 switches::kMessageLoopHistogrammer, 1390 switches::kMessageLoopHistogrammer,
1391 switches::kPlaybackMode, 1391 switches::kPlaybackMode,
1392 switches::kPpapiFlashArgs, 1392 switches::kPpapiFlashArgs,
1393 switches::kPpapiFlashPath, 1393 switches::kPpapiFlashPath,
1394 switches::kPpapiFlashVersion, 1394 switches::kPpapiFlashVersion,
1395 switches::kProfilingAtStart, 1395 switches::kProfilingAtStart,
1396 switches::kProfilingFile, 1396 switches::kProfilingFile,
1397 switches::kProfilingFlush, 1397 switches::kProfilingFlush,
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 switches::kDisableWebRtcEncryption, 2551 switches::kDisableWebRtcEncryption,
2552 }; 2552 };
2553 to_command_line->CopySwitchesFrom(from_command_line, 2553 to_command_line->CopySwitchesFrom(from_command_line,
2554 kWebRtcDevSwitchNames, 2554 kWebRtcDevSwitchNames,
2555 arraysize(kWebRtcDevSwitchNames)); 2555 arraysize(kWebRtcDevSwitchNames));
2556 } 2556 }
2557 } 2557 }
2558 #endif // defined(ENABLE_WEBRTC) 2558 #endif // defined(ENABLE_WEBRTC)
2559 2559
2560 } // namespace chrome 2560 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698