Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1797)

Unified Diff: chrome/renderer/content_settings_observer.cc

Issue 13516002: Whitelist Instant processes for content settings (Closed) Base URL: http://git.chromium.org/chromium/src.git@omniboxtest
Patch Set: 4 Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/search/instant_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 =
« no previous file with comments | « chrome/browser/ui/search/instant_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698