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

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: selfreview 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 2450 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2568 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2568 additional_allowed_schemes); 2569 additional_allowed_schemes);
2569 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2570 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2570 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2571 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2571 for (size_t i = 0; i < extra_parts_.size(); ++i) { 2572 for (size_t i = 0; i < extra_parts_.size(); ++i) {
2572 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( 2573 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem(
2573 additional_allowed_schemes); 2574 additional_allowed_schemes);
2574 } 2575 }
2575 } 2576 }
2576 2577
2578 void ChromeContentBrowserClient::GetSchemesBypassingSecureContextCheckWhitelist(
2579 std::set<std::string>* schemes) {
2580 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes);
2581 }
2582
2577 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2583 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2578 std::vector<storage::URLRequestAutoMountHandler>* handlers) { 2584 std::vector<storage::URLRequestAutoMountHandler>* handlers) {
2579 for (size_t i = 0; i < extra_parts_.size(); ++i) 2585 for (size_t i = 0; i < extra_parts_.size(); ++i)
2580 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); 2586 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers);
2581 } 2587 }
2582 2588
2583 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2589 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2584 content::BrowserContext* browser_context, 2590 content::BrowserContext* browser_context,
2585 const base::FilePath& storage_partition_path, 2591 const base::FilePath& storage_partition_path,
2586 ScopedVector<storage::FileSystemBackend>* additional_backends) { 2592 ScopedVector<storage::FileSystemBackend>* additional_backends) {
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
3004 if (channel <= kMaxDisableEncryptionChannel) { 3010 if (channel <= kMaxDisableEncryptionChannel) {
3005 static const char* const kWebRtcDevSwitchNames[] = { 3011 static const char* const kWebRtcDevSwitchNames[] = {
3006 switches::kDisableWebRtcEncryption, 3012 switches::kDisableWebRtcEncryption,
3007 }; 3013 };
3008 to_command_line->CopySwitchesFrom(from_command_line, 3014 to_command_line->CopySwitchesFrom(from_command_line,
3009 kWebRtcDevSwitchNames, 3015 kWebRtcDevSwitchNames,
3010 arraysize(kWebRtcDevSwitchNames)); 3016 arraysize(kWebRtcDevSwitchNames));
3011 } 3017 }
3012 } 3018 }
3013 #endif // defined(ENABLE_WEBRTC) 3019 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698