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

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 more tests Created 5 years, 7 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 | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.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 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 switches::kEnableOutOfProcessPdf, 1380 switches::kEnableOutOfProcessPdf,
1381 switches::kEnablePluginPlaceholderShadowDom, 1381 switches::kEnablePluginPlaceholderShadowDom,
1382 switches::kJavaScriptHarmony, 1382 switches::kJavaScriptHarmony,
1383 switches::kMessageLoopHistogrammer, 1383 switches::kMessageLoopHistogrammer,
1384 switches::kPpapiFlashArgs, 1384 switches::kPpapiFlashArgs,
1385 switches::kPpapiFlashPath, 1385 switches::kPpapiFlashPath,
1386 switches::kPpapiFlashVersion, 1386 switches::kPpapiFlashVersion,
1387 switches::kProfilingAtStart, 1387 switches::kProfilingAtStart,
1388 switches::kProfilingFile, 1388 switches::kProfilingFile,
1389 switches::kProfilingFlush, 1389 switches::kProfilingFlush,
1390 switches::kUnsafetyTreatInsecureOriginAsSecure,
1390 translate::switches::kTranslateSecurityOrigin, 1391 translate::switches::kTranslateSecurityOrigin,
1391 }; 1392 };
1392 1393
1393 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1394 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1394 arraysize(kSwitchNames)); 1395 arraysize(kSwitchNames));
1395 } else if (process_type == switches::kUtilityProcess) { 1396 } else if (process_type == switches::kUtilityProcess) {
1396 #if defined(ENABLE_EXTENSIONS) 1397 #if defined(ENABLE_EXTENSIONS)
1397 static const char* const kSwitchNames[] = { 1398 static const char* const kSwitchNames[] = {
1398 extensions::switches::kAllowHTTPBackgroundPage, 1399 extensions::switches::kAllowHTTPBackgroundPage,
1399 extensions::switches::kEnableExperimentalExtensionApis, 1400 extensions::switches::kEnableExperimentalExtensionApis,
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
2444 switches::kDisableWebRtcEncryption, 2445 switches::kDisableWebRtcEncryption,
2445 }; 2446 };
2446 to_command_line->CopySwitchesFrom(from_command_line, 2447 to_command_line->CopySwitchesFrom(from_command_line,
2447 kWebRtcDevSwitchNames, 2448 kWebRtcDevSwitchNames,
2448 arraysize(kWebRtcDevSwitchNames)); 2449 arraysize(kWebRtcDevSwitchNames));
2449 } 2450 }
2450 } 2451 }
2451 #endif // defined(ENABLE_WEBRTC) 2452 #endif // defined(ENABLE_WEBRTC)
2452 2453
2453 } // namespace chrome 2454 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698