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

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: 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 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 existing_names->swap(names); 136 existing_names->swap(names);
137 existing_values->swap(values); 137 existing_values->swap(values);
138 } 138 }
139 139
140 } // namespace 140 } // namespace
141 141
142 namespace chrome { 142 namespace chrome {
143 143
144 ChromeContentRendererClient::ChromeContentRendererClient() 144 ChromeContentRendererClient::ChromeContentRendererClient()
145 : spellcheck_provider_(NULL) { 145 : spellcheck_provider_(NULL),
146 image_setting_rules_(NULL) {
146 chrome::InitializePPAPI(); 147 chrome::InitializePPAPI();
147 } 148 }
148 149
149 ChromeContentRendererClient::~ChromeContentRendererClient() { 150 ChromeContentRendererClient::~ChromeContentRendererClient() {
150 chrome::UninitializePPAPI(); 151 chrome::UninitializePPAPI();
151 } 152 }
152 153
153 void ChromeContentRendererClient::RenderThreadStarted() { 154 void ChromeContentRendererClient::RenderThreadStarted() {
154 chrome_observer_.reset(new ChromeRenderProcessObserver(this)); 155 chrome_observer_.reset(new ChromeRenderProcessObserver(this));
155 extension_dispatcher_.reset(new ExtensionDispatcher()); 156 extension_dispatcher_.reset(new ExtensionDispatcher());
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 // chrome:, and chrome-extension: resources shouldn't trigger insecure 216 // chrome:, and chrome-extension: resources shouldn't trigger insecure
216 // content warnings. 217 // content warnings.
217 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); 218 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
218 219
219 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 220 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
220 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 221 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
221 } 222 }
222 223
223 void ChromeContentRendererClient::RenderViewCreated( 224 void ChromeContentRendererClient::RenderViewCreated(
224 content::RenderView* render_view) { 225 content::RenderView* render_view) {
226 // |SetImageSettingRules| should've been called by now.
227 DCHECK(image_setting_rules_);
225 ContentSettingsObserver* content_settings = 228 ContentSettingsObserver* content_settings =
226 new ContentSettingsObserver(render_view); 229 new ContentSettingsObserver(render_view, image_setting_rules_);
227 new ExtensionHelper(render_view, extension_dispatcher_.get()); 230 new ExtensionHelper(render_view, extension_dispatcher_.get());
228 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 231 new PageLoadHistograms(render_view, histogram_snapshots_.get());
229 new PrintWebViewHelper(render_view); 232 new PrintWebViewHelper(render_view);
230 new SearchBox(render_view); 233 new SearchBox(render_view);
231 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 234 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
232 #if defined(ENABLE_SAFE_BROWSING) 235 #if defined(ENABLE_SAFE_BROWSING)
233 safe_browsing::MalwareDOMDetails::Create(render_view); 236 safe_browsing::MalwareDOMDetails::Create(render_view);
234 #endif 237 #endif
235 238
236 PasswordAutofillManager* password_autofill_manager = 239 PasswordAutofillManager* password_autofill_manager =
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 for (ExtensionSet::const_iterator it = extensions.begin(); 858 for (ExtensionSet::const_iterator it = extensions.begin();
856 it != extensions.end(); ++it) { 859 it != extensions.end(); ++it) {
857 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) && 860 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) &&
858 it->second->name().find("Adblock") != std::string::npos && 861 it->second->name().find("Adblock") != std::string::npos &&
859 it->second->name().find("Plus") != std::string::npos) 862 it->second->name().find("Plus") != std::string::npos)
860 return true; 863 return true;
861 } 864 }
862 return false; 865 return false;
863 } 866 }
864 867
868 void ChromeContentRendererClient::SetImageSettingRules(
869 const ContentSettingsForOneType* image_setting_rules) {
870 image_setting_rules_ = image_setting_rules;
871 }
872
865 } // namespace chrome 873 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698