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

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: Code review comments. Created 9 years, 3 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/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // chrome:, and chrome-extension: resources shouldn't trigger insecure 212 // chrome:, and chrome-extension: resources shouldn't trigger insecure
213 // content warnings. 213 // content warnings.
214 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); 214 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
215 215
216 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 216 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
217 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 217 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
218 } 218 }
219 219
220 void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) { 220 void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) {
221 ContentSettingsObserver* content_settings = 221 ContentSettingsObserver* content_settings =
222 new ContentSettingsObserver(render_view); 222 new ContentSettingsObserver(render_view, &image_setting_rules_);
223 new ExtensionHelper(render_view, extension_dispatcher_.get()); 223 new ExtensionHelper(render_view, extension_dispatcher_.get());
224 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 224 new PageLoadHistograms(render_view, histogram_snapshots_.get());
225 new PrintWebViewHelper(render_view); 225 new PrintWebViewHelper(render_view);
226 new SearchBox(render_view); 226 new SearchBox(render_view);
227 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 227 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
228 #if defined(ENABLE_SAFE_BROWSING) 228 #if defined(ENABLE_SAFE_BROWSING)
229 safe_browsing::MalwareDOMDetails::Create(render_view); 229 safe_browsing::MalwareDOMDetails::Create(render_view);
230 #endif 230 #endif
231 231
232 PasswordAutofillManager* password_autofill_manager = 232 PasswordAutofillManager* password_autofill_manager =
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 const GURL& first_party_for_cookies, 705 const GURL& first_party_for_cookies,
706 const std::string& value) { 706 const std::string& value) {
707 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame)) { 707 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame)) {
708 sender->Send(new ChromeViewHostMsg_SetCookie( 708 sender->Send(new ChromeViewHostMsg_SetCookie(
709 MSG_ROUTING_NONE, url, first_party_for_cookies, value)); 709 MSG_ROUTING_NONE, url, first_party_for_cookies, value));
710 return true; 710 return true;
711 } 711 }
712 return false; 712 return false;
713 } 713 }
714 714
715 void ChromeContentRendererClient::SetImageSettingRules(
716 const ContentSettingRules& image_setting_rules) {
717 image_setting_rules_ = image_setting_rules;
718 }
715 719
716 void ChromeContentRendererClient::SetExtensionDispatcher( 720 void ChromeContentRendererClient::SetExtensionDispatcher(
717 ExtensionDispatcher* extension_dispatcher) { 721 ExtensionDispatcher* extension_dispatcher) {
718 extension_dispatcher_.reset(extension_dispatcher); 722 extension_dispatcher_.reset(extension_dispatcher);
719 } 723 }
720 724
721 bool ChromeContentRendererClient::CrossesExtensionExtents( 725 bool ChromeContentRendererClient::CrossesExtensionExtents(
722 WebFrame* frame, 726 WebFrame* frame,
723 const GURL& new_url, 727 const GURL& new_url,
724 bool is_initial_navigation) { 728 bool is_initial_navigation) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 if (spellcheck_.get()) 769 if (spellcheck_.get())
766 thread->RemoveObserver(spellcheck_.get()); 770 thread->RemoveObserver(spellcheck_.get());
767 SpellCheck* new_spellcheck = new SpellCheck(); 771 SpellCheck* new_spellcheck = new SpellCheck();
768 if (spellcheck_provider_) 772 if (spellcheck_provider_)
769 spellcheck_provider_->SetSpellCheck(new_spellcheck); 773 spellcheck_provider_->SetSpellCheck(new_spellcheck);
770 spellcheck_.reset(new_spellcheck); 774 spellcheck_.reset(new_spellcheck);
771 thread->AddObserver(new_spellcheck); 775 thread->AddObserver(new_spellcheck);
772 } 776 }
773 777
774 } // namespace chrome 778 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698