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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 7831075: Delegating the "are images allowed" decision to renderer. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Test build fixes. Created 9 years, 2 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
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 79f9d775c52c7356e2d0ef6a5cf0db97c98e25bb..13e093a8ba35806bb09d7a1cff857a88cc578def 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -142,7 +142,8 @@ static void AppendParams(const std::vector<string16>& additional_names,
namespace chrome {
ChromeContentRendererClient::ChromeContentRendererClient()
- : spellcheck_provider_(NULL) {
+ : spellcheck_provider_(NULL),
+ image_setting_rules_(NULL) {
chrome::InitializePPAPI();
}
@@ -222,8 +223,10 @@ void ChromeContentRendererClient::RenderThreadStarted() {
void ChromeContentRendererClient::RenderViewCreated(
content::RenderView* render_view) {
+ // |SetImageSettingRules| should've been called by now.
+ DCHECK(image_setting_rules_);
ContentSettingsObserver* content_settings =
- new ContentSettingsObserver(render_view);
+ new ContentSettingsObserver(render_view, image_setting_rules_);
new ExtensionHelper(render_view, extension_dispatcher_.get());
new PageLoadHistograms(render_view, histogram_snapshots_.get());
new PrintWebViewHelper(render_view);
@@ -862,4 +865,9 @@ bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
return false;
}
+void ChromeContentRendererClient::SetImageSettingRules(
+ const ContentSettingsForOneType* image_setting_rules) {
+ image_setting_rules_ = image_setting_rules;
+}
+
} // namespace chrome

Powered by Google App Engine
This is Rietveld 408576698