| Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| index 75f77c05654500465528e2a64370caa8005e9b37..016b995f2bb5c3e6add53b31fe40ed86d085a292 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| @@ -17,10 +17,13 @@
|
| #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
|
| #include "chrome/browser/net/predictor.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/profiles/profile_io_data.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "components/content_settings/content/common/content_settings_messages.h"
|
| #include "components/content_settings/core/browser/cookie_settings.h"
|
| +#include "components/content_settings/core/browser/host_content_settings_map.h"
|
| +#include "components/content_settings/core/common/content_settings.h"
|
| #include "components/network_hints/common/network_hints_common.h"
|
| #include "components/network_hints/common/network_hints_messages.h"
|
| #include "components/rappor/rappor_service.h"
|
| @@ -58,6 +61,8 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter(int render_process_id,
|
| arraysize(kFilteredMessageClasses)),
|
| render_process_id_(render_process_id),
|
| profile_(profile),
|
| + profile_io_data_(
|
| + ProfileIOData::FromResourceContext(profile_->GetResourceContext())),
|
| predictor_(profile_->GetNetworkPredictor()),
|
| cookie_settings_(CookieSettingsFactory::GetForProfile(profile)) {
|
| }
|
| @@ -74,6 +79,7 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| OnUpdatedCacheStats)
|
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase)
|
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage)
|
| + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowKeygen, OnAllowKeygen)
|
| IPC_MESSAGE_HANDLER_DELAY_REPLY(
|
| ChromeViewHostMsg_RequestFileSystemAccessSync,
|
| OnRequestFileSystemAccessSync)
|
| @@ -169,6 +175,18 @@ void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id,
|
| !*allowed));
|
| }
|
|
|
| +void ChromeRenderMessageFilter::OnAllowKeygen(
|
| + int render_frame_id,
|
| + const GURL& origin_url,
|
| + bool* allowed) {
|
| + HostContentSettingsMap* content_settings =
|
| + profile_io_data_->GetHostContentSettingsMap();
|
| +
|
| + *allowed = content_settings->GetContentSetting(
|
| + origin_url, origin_url, CONTENT_SETTINGS_TYPE_KEYGEN, std::string()) ==
|
| + CONTENT_SETTING_ALLOW;
|
| +}
|
| +
|
| void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync(
|
| int render_frame_id,
|
| const GURL& origin_url,
|
|
|