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

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

Issue 887223005: Skip interstitials and don't block requests for localhost SSL errors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary #include 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
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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 extensions::switches::kAllowHTTPBackgroundPage, 1440 extensions::switches::kAllowHTTPBackgroundPage,
1441 extensions::switches::kAllowLegacyExtensionManifests, 1441 extensions::switches::kAllowLegacyExtensionManifests,
1442 extensions::switches::kEnableSurfaceWorker, 1442 extensions::switches::kEnableSurfaceWorker,
1443 extensions::switches::kEnableAppWindowControls, 1443 extensions::switches::kEnableAppWindowControls,
1444 extensions::switches::kEnableEmbeddedExtensionOptions, 1444 extensions::switches::kEnableEmbeddedExtensionOptions,
1445 extensions::switches::kEnableExperimentalExtensionApis, 1445 extensions::switches::kEnableExperimentalExtensionApis,
1446 extensions::switches::kEnableScriptsRequireAction, 1446 extensions::switches::kEnableScriptsRequireAction,
1447 extensions::switches::kExtensionsOnChromeURLs, 1447 extensions::switches::kExtensionsOnChromeURLs,
1448 extensions::switches::kWhitelistedExtensionID, 1448 extensions::switches::kWhitelistedExtensionID,
1449 #endif 1449 #endif
1450 switches::kAllowInsecureLocalhost,
1450 switches::kAppsCheckoutURL, 1451 switches::kAppsCheckoutURL,
1451 switches::kAppsGalleryURL, 1452 switches::kAppsGalleryURL,
1452 switches::kCloudPrintURL, 1453 switches::kCloudPrintURL,
1453 switches::kCloudPrintXmppEndpoint, 1454 switches::kCloudPrintXmppEndpoint,
1454 switches::kDisableBundledPpapiFlash, 1455 switches::kDisableBundledPpapiFlash,
1455 switches::kDisableCastStreamingHWEncoding, 1456 switches::kDisableCastStreamingHWEncoding,
1456 switches::kDisableJavaScriptHarmonyShipping, 1457 switches::kDisableJavaScriptHarmonyShipping,
1457 switches::kDisableNewBookmarkApps, 1458 switches::kDisableNewBookmarkApps,
1458 switches::kDisableOutOfProcessPdf, 1459 switches::kDisableOutOfProcessPdf,
1459 switches::kEnableBenchmarking, 1460 switches::kEnableBenchmarking,
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
2622 switches::kDisableWebRtcEncryption, 2623 switches::kDisableWebRtcEncryption,
2623 }; 2624 };
2624 to_command_line->CopySwitchesFrom(from_command_line, 2625 to_command_line->CopySwitchesFrom(from_command_line,
2625 kWebRtcDevSwitchNames, 2626 kWebRtcDevSwitchNames,
2626 arraysize(kWebRtcDevSwitchNames)); 2627 arraysize(kWebRtcDevSwitchNames));
2627 } 2628 }
2628 } 2629 }
2629 #endif // defined(ENABLE_WEBRTC) 2630 #endif // defined(ENABLE_WEBRTC)
2630 2631
2631 } // namespace chrome 2632 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698