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

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

Issue 1072933006: Support whitelisting to handle insecure origins as trustworthy origins (chromium) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added test, added IsOriginSecure plumbing etc Created 5 years, 8 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 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 switches::kEnableOutOfProcessPdf, 1392 switches::kEnableOutOfProcessPdf,
1393 switches::kEnablePluginPlaceholderShadowDom, 1393 switches::kEnablePluginPlaceholderShadowDom,
1394 switches::kJavaScriptHarmony, 1394 switches::kJavaScriptHarmony,
1395 switches::kMessageLoopHistogrammer, 1395 switches::kMessageLoopHistogrammer,
1396 switches::kPpapiFlashArgs, 1396 switches::kPpapiFlashArgs,
1397 switches::kPpapiFlashPath, 1397 switches::kPpapiFlashPath,
1398 switches::kPpapiFlashVersion, 1398 switches::kPpapiFlashVersion,
1399 switches::kProfilingAtStart, 1399 switches::kProfilingAtStart,
1400 switches::kProfilingFile, 1400 switches::kProfilingFile,
1401 switches::kProfilingFlush, 1401 switches::kProfilingFlush,
1402 switches::kUnsafetyTreatInsecureOriginAsSecure,
1402 translate::switches::kTranslateSecurityOrigin, 1403 translate::switches::kTranslateSecurityOrigin,
1403 }; 1404 };
1404 1405
1405 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1406 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1406 arraysize(kSwitchNames)); 1407 arraysize(kSwitchNames));
1407 } else if (process_type == switches::kUtilityProcess) { 1408 } else if (process_type == switches::kUtilityProcess) {
1408 #if defined(ENABLE_EXTENSIONS) 1409 #if defined(ENABLE_EXTENSIONS)
1409 static const char* const kSwitchNames[] = { 1410 static const char* const kSwitchNames[] = {
1410 extensions::switches::kAllowHTTPBackgroundPage, 1411 extensions::switches::kAllowHTTPBackgroundPage,
1411 extensions::switches::kEnableExperimentalExtensionApis, 1412 extensions::switches::kEnableExperimentalExtensionApis,
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2450 switches::kDisableWebRtcEncryption, 2451 switches::kDisableWebRtcEncryption,
2451 }; 2452 };
2452 to_command_line->CopySwitchesFrom(from_command_line, 2453 to_command_line->CopySwitchesFrom(from_command_line,
2453 kWebRtcDevSwitchNames, 2454 kWebRtcDevSwitchNames,
2454 arraysize(kWebRtcDevSwitchNames)); 2455 arraysize(kWebRtcDevSwitchNames));
2455 } 2456 }
2456 } 2457 }
2457 #endif // defined(ENABLE_WEBRTC) 2458 #endif // defined(ENABLE_WEBRTC)
2458 2459
2459 } // namespace chrome 2460 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | chrome/browser/ui/startup/bad_flags_prompt.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698