Index: chrome/renderer/content_settings_observer.cc |
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc |
index 9c38acc2b64b37a2547f388128b1fc9212c525f6..c64873633a4b6f9e65aa94f739038c108b267e2a 100644 |
--- a/chrome/renderer/content_settings_observer.cc |
+++ b/chrome/renderer/content_settings_observer.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/renderer/content_settings_observer.h" |
+#include "base/command_line.h" |
+#include "chrome/common/chrome_switches.h" |
#include "chrome/common/render_messages.h" |
#include "chrome/common/url_constants.h" |
#include "content/public/renderer/document_state.h" |
@@ -318,6 +320,10 @@ void ContentSettingsObserver::ClearBlockedContentSettings() { |
} |
bool ContentSettingsObserver::IsWhitelistedForContentSettings(WebFrame* frame) { |
+ // Whitelist Instant processes. |
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInstantProcess)) |
markusheintz_
2013/04/17 19:24:38
Sorry for being late in this party. Does this whit
ckocagil
2013/04/17 21:39:42
No, it affects all Instant processes, including th
|
+ return true; |
+ |
// Whitelist ftp directory listings, as they require JavaScript to function |
// properly. |
webkit_glue::WebURLResponseExtraDataImpl* extra_data = |