Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index a47903cc9db31f220b3bc6e719530e0ef963a1cf..e41afd9f051024f0ceb0274da7154dec7a68e3b6 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -82,6 +82,7 @@ |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/content_settings.h" |
#include "chrome/common/env_vars.h" |
#include "chrome/common/logging_chrome.h" |
#include "chrome/common/pepper_permission_util.h" |
@@ -816,8 +817,7 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( |
RendererContentSettingRules rules; |
if (host->IsIsolatedGuest()) { |
#if defined(ENABLE_EXTENSIONS) |
- GuestViewBase::GetDefaultContentSettingRules(&rules, |
- profile->IsOffTheRecord()); |
+ GetGuestViewDefaultContentSettingRules(profile->IsOffTheRecord(), &rules); |
#else |
NOTREACHED(); |
#endif |
@@ -1571,6 +1571,24 @@ void ChromeContentBrowserClient::RequestFileSystemPermissionOnUIThread( |
allowed_by_default, |
callback); |
} |
+ |
+void ChromeContentBrowserClient::GetGuestViewDefaultContentSettingRules( |
+ bool incognito, |
+ RendererContentSettingRules* rules) { |
+ rules->image_rules.push_back( |
+ ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
+ ContentSettingsPattern::Wildcard(), |
+ CONTENT_SETTING_ALLOW, |
+ std::string(), |
+ incognito)); |
+ |
+ rules->script_rules.push_back( |
+ ContentSettingPatternSource(ContentSettingsPattern::Wildcard(), |
+ ContentSettingsPattern::Wildcard(), |
+ CONTENT_SETTING_ALLOW, |
+ std::string(), |
+ incognito)); |
+} |
#endif |
void ChromeContentBrowserClient::FileSystemAccessed( |