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

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: rebase again 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/ssl/chrome_ssl_host_state_delegate.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 1431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 extensions::switches::kAllowHTTPBackgroundPage, 1442 extensions::switches::kAllowHTTPBackgroundPage,
1443 extensions::switches::kAllowLegacyExtensionManifests, 1443 extensions::switches::kAllowLegacyExtensionManifests,
1444 extensions::switches::kEnableSurfaceWorker, 1444 extensions::switches::kEnableSurfaceWorker,
1445 extensions::switches::kEnableAppWindowControls, 1445 extensions::switches::kEnableAppWindowControls,
1446 extensions::switches::kEnableEmbeddedExtensionOptions, 1446 extensions::switches::kEnableEmbeddedExtensionOptions,
1447 extensions::switches::kEnableExperimentalExtensionApis, 1447 extensions::switches::kEnableExperimentalExtensionApis,
1448 extensions::switches::kEnableScriptsRequireAction, 1448 extensions::switches::kEnableScriptsRequireAction,
1449 extensions::switches::kExtensionsOnChromeURLs, 1449 extensions::switches::kExtensionsOnChromeURLs,
1450 extensions::switches::kWhitelistedExtensionID, 1450 extensions::switches::kWhitelistedExtensionID,
1451 #endif 1451 #endif
1452 switches::kAllowInsecureLocalhost,
1452 switches::kAppsCheckoutURL, 1453 switches::kAppsCheckoutURL,
1453 switches::kAppsGalleryURL, 1454 switches::kAppsGalleryURL,
1454 switches::kCloudPrintURL, 1455 switches::kCloudPrintURL,
1455 switches::kCloudPrintXmppEndpoint, 1456 switches::kCloudPrintXmppEndpoint,
1456 switches::kDisableBundledPpapiFlash, 1457 switches::kDisableBundledPpapiFlash,
1457 switches::kDisableCastStreamingHWEncoding, 1458 switches::kDisableCastStreamingHWEncoding,
1458 switches::kDisableJavaScriptHarmonyShipping, 1459 switches::kDisableJavaScriptHarmonyShipping,
1459 switches::kDisableNewBookmarkApps, 1460 switches::kDisableNewBookmarkApps,
1460 switches::kDisableOutOfProcessPdf, 1461 switches::kDisableOutOfProcessPdf,
1461 switches::kEnableBenchmarking, 1462 switches::kEnableBenchmarking,
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
2634 switches::kDisableWebRtcEncryption, 2635 switches::kDisableWebRtcEncryption,
2635 }; 2636 };
2636 to_command_line->CopySwitchesFrom(from_command_line, 2637 to_command_line->CopySwitchesFrom(from_command_line,
2637 kWebRtcDevSwitchNames, 2638 kWebRtcDevSwitchNames,
2638 arraysize(kWebRtcDevSwitchNames)); 2639 arraysize(kWebRtcDevSwitchNames));
2639 } 2640 }
2640 } 2641 }
2641 #endif // defined(ENABLE_WEBRTC) 2642 #endif // defined(ENABLE_WEBRTC)
2642 2643
2643 } // namespace chrome 2644 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ssl/chrome_ssl_host_state_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698