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

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

Issue 2009453002: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: horo comments 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 2440 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2558 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2558 additional_allowed_schemes); 2559 additional_allowed_schemes);
2559 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2560 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2560 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2561 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2561 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2562 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2562 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( 2563 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem(
2563 additional_allowed_schemes); 2564 additional_allowed_schemes);
2564 } 2565 }
2565 } 2566 }
2566 2567
2568 void ChromeContentBrowserClient::GetSchemesBypassingSecureContextCheckWhitelist(
2569 std::set<std::string>* schemes) {
2570 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes);
2571 }
2572
2567 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2573 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2568 std::vector<storage::URLRequestAutoMountHandler>* handlers) { 2574 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2569 for (size_t i = 0; i < extra_parts_.size(); ++i) 2575 for (size_t i = 0; i < extra_parts_.size(); ++i)
2570 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2576 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2571 } 2577 }
2572 2578
2573 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2579 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2574 content::BrowserContext* browser_context, 2580 content::BrowserContext* browser_context,
2575 const base::FilePath& storage_partition_path, 2581 const base::FilePath& storage_partition_path,
2576 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2582 ScopedVector<storage::FileSystemBackend>* additional_backends) {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
2994 if (channel <= kMaxDisableEncryptionChannel) { 3000 if (channel <= kMaxDisableEncryptionChannel) {
2995 static const char* const kWebRtcDevSwitchNames[] = { 3001 static const char* const kWebRtcDevSwitchNames[] = {
2996 switches::kDisableWebRtcEncryption, 3002 switches::kDisableWebRtcEncryption,
2997 }; 3003 };
2998 to_command_line->CopySwitchesFrom(from_command_line, 3004 to_command_line->CopySwitchesFrom(from_command_line,
2999 kWebRtcDevSwitchNames, 3005 kWebRtcDevSwitchNames,
3000 arraysize(kWebRtcDevSwitchNames)); 3006 arraysize(kWebRtcDevSwitchNames));
3001 } 3007 }
3002 } 3008 }
3003 #endif // defined(ENABLE_WEBRTC) 3009 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698