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

Side by Side 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: Rebased. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // content warnings. 216 // content warnings.
217 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); 217 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
218 218
219 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 219 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
220 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 220 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
221 } 221 }
222 222
223 void ChromeContentRendererClient::RenderViewCreated( 223 void ChromeContentRendererClient::RenderViewCreated(
224 content::RenderView* render_view) { 224 content::RenderView* render_view) {
225 ContentSettingsObserver* content_settings = 225 ContentSettingsObserver* content_settings =
226 new ContentSettingsObserver(render_view); 226 new ContentSettingsObserver(render_view, &image_setting_rules_);
227 new ExtensionHelper(render_view, extension_dispatcher_.get()); 227 new ExtensionHelper(render_view, extension_dispatcher_.get());
228 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 228 new PageLoadHistograms(render_view, histogram_snapshots_.get());
229 new PrintWebViewHelper(render_view); 229 new PrintWebViewHelper(render_view);
230 new SearchBox(render_view); 230 new SearchBox(render_view);
231 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 231 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
232 #if defined(ENABLE_SAFE_BROWSING) 232 #if defined(ENABLE_SAFE_BROWSING)
233 safe_browsing::MalwareDOMDetails::Create(render_view); 233 safe_browsing::MalwareDOMDetails::Create(render_view);
234 #endif 234 #endif
235 235
236 PasswordAutofillManager* password_autofill_manager = 236 PasswordAutofillManager* password_autofill_manager =
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 for (ExtensionSet::const_iterator it = extensions.begin(); 812 for (ExtensionSet::const_iterator it = extensions.begin();
813 it != extensions.end(); ++it) { 813 it != extensions.end(); ++it) {
814 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) && 814 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) &&
815 it->second->name().find("Adblock") != std::string::npos && 815 it->second->name().find("Adblock") != std::string::npos &&
816 it->second->name().find("Plus") != std::string::npos) 816 it->second->name().find("Plus") != std::string::npos)
817 return true; 817 return true;
818 } 818 }
819 return false; 819 return false;
820 } 820 }
821 821
822 void ChromeContentRendererClient::SetImageSettingRules(
823 const ContentSettingsForOneType& image_setting_rules) {
824 image_setting_rules_ = image_setting_rules;
825 }
826
822 } // namespace chrome 827 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698