Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 7fe94430ddf852de4a7f424b6538ff884cbf99db..93b2fb11ced21f94a1b45d966c359e7d94c7a66c 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -444,12 +444,14 @@ void ChromeContentRendererClient::RenderFrameCreated( |
content::RenderFrame* render_frame) { |
new ChromeRenderFrameObserver(render_frame); |
+ bool should_whitelist_for_content_settings = |
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kInstantProcess); |
extensions::Dispatcher* ext_dispatcher = NULL; |
#if defined(ENABLE_EXTENSIONS) |
ext_dispatcher = extension_dispatcher_.get(); |
#endif |
- ContentSettingsObserver* content_settings = |
- new ContentSettingsObserver(render_frame, ext_dispatcher); |
+ ContentSettingsObserver* content_settings = new ContentSettingsObserver( |
+ render_frame, ext_dispatcher, should_whitelist_for_content_settings); |
if (chrome_observer_.get()) { |
content_settings->SetContentSettingRules( |
chrome_observer_->content_setting_rules()); |