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

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

Powered by Google App Engine
This is Rietveld 408576698