OLD | NEW |
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 Loading... |
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/core/common/autofill_switches.h" | 112 #include "components/autofill/core/common/autofill_switches.h" |
112 #include "components/cdm/browser/cdm_message_filter_android.h" | 113 #include "components/cdm/browser/cdm_message_filter_android.h" |
113 #include "components/cloud_devices/common/cloud_devices_switches.h" | 114 #include "components/cloud_devices/common/cloud_devices_switches.h" |
114 #include "components/content_settings/core/browser/content_settings_utils.h" | 115 #include "components/content_settings/core/browser/content_settings_utils.h" |
115 #include "components/content_settings/core/browser/cookie_settings.h" | 116 #include "components/content_settings/core/browser/cookie_settings.h" |
116 #include "components/content_settings/core/browser/host_content_settings_map.h" | 117 #include "components/content_settings/core/browser/host_content_settings_map.h" |
(...skipping 2444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2561 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2562 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
2562 additional_allowed_schemes); | 2563 additional_allowed_schemes); |
2563 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); | 2564 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); |
2564 additional_allowed_schemes->push_back(content::kChromeUIScheme); | 2565 additional_allowed_schemes->push_back(content::kChromeUIScheme); |
2565 for (size_t i = 0; i < extra_parts_.size(); ++i) { | 2566 for (size_t i = 0; i < extra_parts_.size(); ++i) { |
2566 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( | 2567 extra_parts_[i]->GetAdditionalAllowedSchemesForFileSystem( |
2567 additional_allowed_schemes); | 2568 additional_allowed_schemes); |
2568 } | 2569 } |
2569 } | 2570 } |
2570 | 2571 |
| 2572 void ChromeContentBrowserClient::GetSchemesBypassingSecureContextCheckWhitelist( |
| 2573 std::set<std::string>* schemes) { |
| 2574 return ::GetSchemesBypassingSecureContextCheckWhitelist(schemes); |
| 2575 } |
| 2576 |
2571 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( | 2577 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( |
2572 std::vector<storage::URLRequestAutoMountHandler>* handlers) { | 2578 std::vector<storage::URLRequestAutoMountHandler>* handlers) { |
2573 for (size_t i = 0; i < extra_parts_.size(); ++i) | 2579 for (size_t i = 0; i < extra_parts_.size(); ++i) |
2574 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); | 2580 extra_parts_[i]->GetURLRequestAutoMountHandlers(handlers); |
2575 } | 2581 } |
2576 | 2582 |
2577 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( | 2583 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
2578 content::BrowserContext* browser_context, | 2584 content::BrowserContext* browser_context, |
2579 const base::FilePath& storage_partition_path, | 2585 const base::FilePath& storage_partition_path, |
2580 ScopedVector<storage::FileSystemBackend>* additional_backends) { | 2586 ScopedVector<storage::FileSystemBackend>* additional_backends) { |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2987 if (channel <= kMaxDisableEncryptionChannel) { | 2993 if (channel <= kMaxDisableEncryptionChannel) { |
2988 static const char* const kWebRtcDevSwitchNames[] = { | 2994 static const char* const kWebRtcDevSwitchNames[] = { |
2989 switches::kDisableWebRtcEncryption, | 2995 switches::kDisableWebRtcEncryption, |
2990 }; | 2996 }; |
2991 to_command_line->CopySwitchesFrom(from_command_line, | 2997 to_command_line->CopySwitchesFrom(from_command_line, |
2992 kWebRtcDevSwitchNames, | 2998 kWebRtcDevSwitchNames, |
2993 arraysize(kWebRtcDevSwitchNames)); | 2999 arraysize(kWebRtcDevSwitchNames)); |
2994 } | 3000 } |
2995 } | 3001 } |
2996 #endif // defined(ENABLE_WEBRTC) | 3002 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |