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

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

Issue 2071433003: Reland: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revised Created 4 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
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "chrome/common/channel_info.h" 97 #include "chrome/common/channel_info.h"
98 #include "chrome/common/chrome_constants.h" 98 #include "chrome/common/chrome_constants.h"
99 #include "chrome/common/chrome_paths.h" 99 #include "chrome/common/chrome_paths.h"
100 #include "chrome/common/chrome_switches.h" 100 #include "chrome/common/chrome_switches.h"
101 #include "chrome/common/env_vars.h" 101 #include "chrome/common/env_vars.h"
102 #include "chrome/common/features.h" 102 #include "chrome/common/features.h"
103 #include "chrome/common/logging_chrome.h" 103 #include "chrome/common/logging_chrome.h"
104 #include "chrome/common/pepper_permission_util.h" 104 #include "chrome/common/pepper_permission_util.h"
105 #include "chrome/common/pref_names.h" 105 #include "chrome/common/pref_names.h"
106 #include "chrome/common/render_messages.h" 106 #include "chrome/common/render_messages.h"
107 #include "chrome/common/secure_origin_whitelist.h"
107 #include "chrome/common/url_constants.h" 108 #include "chrome/common/url_constants.h"
108 #include "chrome/grit/generated_resources.h" 109 #include "chrome/grit/generated_resources.h"
109 #include "chrome/installer/util/google_update_settings.h" 110 #include "chrome/installer/util/google_update_settings.h"
110 #include "chromeos/chromeos_constants.h" 111 #include "chromeos/chromeos_constants.h"
111 #include "components/autofill/content/browser/content_autofill_driver_factory.h" 112 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
112 #include "components/autofill/core/common/autofill_switches.h" 113 #include "components/autofill/core/common/autofill_switches.h"
113 #include "components/cdm/browser/cdm_message_filter_android.h" 114 #include "components/cdm/browser/cdm_message_filter_android.h"
114 #include "components/cloud_devices/common/cloud_devices_switches.h" 115 #include "components/cloud_devices/common/cloud_devices_switches.h"
115 #include "components/content_settings/core/browser/content_settings_utils.h" 116 #include "components/content_settings/core/browser/content_settings_utils.h"
116 #include "components/content_settings/core/browser/cookie_settings.h" 117 #include "components/content_settings/core/browser/cookie_settings.h"
(...skipping 2396 matching lines...) Expand 10 before | Expand all | Expand 10 after
2513 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2514 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2514 additional_allowed_schemes); 2515 additional_allowed_schemes);
2515 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2516 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2516 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2517 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2517 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2518 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2518 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( 2519 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem(
2519 additional_allowed_schemes); 2520 additional_allowed_schemes);
2520 } 2521 }
2521 } 2522 }
2522 2523
2524 void ChromeContentBrowserClient::GetSchemesBypassingSecureContextCheckWhitelist(
2525 std::set<std::string>* schemes) {
2526 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes);
2527 }
2528
2523 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2529 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2524 std::vector<storage::URLRequestAutoMountHandler>* handlers) { 2530 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2525 for (size_t i = 0; i < extra_parts_.size(); ++i) 2531 for (size_t i = 0; i < extra_parts_.size(); ++i)
2526 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2532 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2527 } 2533 }
2528 2534
2529 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2535 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2530 content::BrowserContext* browser_context, 2536 content::BrowserContext* browser_context,
2531 const base::FilePath& storage_partition_path, 2537 const base::FilePath& storage_partition_path,
2532 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2538 ScopedVector<storage::FileSystemBackend>* additional_backends) {
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
2959 if (channel <= kMaxDisableEncryptionChannel) { 2965 if (channel <= kMaxDisableEncryptionChannel) {
2960 static const char* const kWebRtcDevSwitchNames[] = { 2966 static const char* const kWebRtcDevSwitchNames[] = {
2961 switches::kDisableWebRtcEncryption, 2967 switches::kDisableWebRtcEncryption,
2962 }; 2968 };
2963 to_command_line->CopySwitchesFrom(from_command_line, 2969 to_command_line->CopySwitchesFrom(from_command_line,
2964 kWebRtcDevSwitchNames, 2970 kWebRtcDevSwitchNames,
2965 arraysize(kWebRtcDevSwitchNames)); 2971 arraysize(kWebRtcDevSwitchNames));
2966 } 2972 }
2967 } 2973 }
2968 #endif // defined(ENABLE_WEBRTC) 2974 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/extensions/service_worker_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698