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

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

Issue 2955803002: Propogate kUnsafelyTreatInsecureOriginAsSecure flag to the zygote process (Closed)
Patch Set: Created 3 years, 6 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 | no next file » | 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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1879 matching lines...) Expand 10 before | Expand all | Expand 10 after
1890 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1890 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1891 switches::kDisableBundledPpapiFlash, 1891 switches::kDisableBundledPpapiFlash,
1892 #if !defined(DISABLE_NACL) 1892 #if !defined(DISABLE_NACL)
1893 switches::kEnableNaClDebug, 1893 switches::kEnableNaClDebug,
1894 switches::kEnableNaClNonSfiMode, 1894 switches::kEnableNaClNonSfiMode,
1895 switches::kForcePNaClSubzero, 1895 switches::kForcePNaClSubzero,
1896 switches::kNaClDangerousNoSandboxNonSfi, 1896 switches::kNaClDangerousNoSandboxNonSfi,
1897 #endif 1897 #endif
1898 switches::kPpapiFlashPath, 1898 switches::kPpapiFlashPath,
1899 switches::kPpapiFlashVersion, 1899 switches::kPpapiFlashVersion,
1900 switches::kUnsafelyTreatInsecureOriginAsSecure,
1900 }; 1901 };
1901 1902
1902 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1903 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1903 arraysize(kSwitchNames)); 1904 arraysize(kSwitchNames));
1904 } else if (process_type == switches::kGpuProcess) { 1905 } else if (process_type == switches::kGpuProcess) {
1905 // If --ignore-gpu-blacklist is passed in, don't send in crash reports 1906 // If --ignore-gpu-blacklist is passed in, don't send in crash reports
1906 // because GPU is expected to be unreliable. 1907 // because GPU is expected to be unreliable.
1907 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && 1908 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) &&
1908 !command_line->HasSwitch(switches::kDisableBreakpad)) 1909 !command_line->HasSwitch(switches::kDisableBreakpad))
1909 command_line->AppendSwitch(switches::kDisableBreakpad); 1910 command_line->AppendSwitch(switches::kDisableBreakpad);
(...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after
3464 safe_browsing_service_->database_manager(), 3465 safe_browsing_service_->database_manager(),
3465 safe_browsing_service_->ui_manager(), wc_getter)); 3466 safe_browsing_service_->ui_manager(), wc_getter));
3466 return result; 3467 return result;
3467 } 3468 }
3468 3469
3469 // static 3470 // static
3470 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( 3471 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
3471 const storage::QuotaSettings* settings) { 3472 const storage::QuotaSettings* settings) {
3472 g_default_quota_settings = settings; 3473 g_default_quota_settings = settings;
3473 } 3474 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698