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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 8409006: Take script URLs into account when applying script content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review. Created 9 years, 1 month 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 212 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
213 } 213 }
214 214
215 void ChromeContentRendererClient::RenderViewCreated( 215 void ChromeContentRendererClient::RenderViewCreated(
216 content::RenderView* render_view) { 216 content::RenderView* render_view) {
217 ContentSettingsObserver* content_settings = 217 ContentSettingsObserver* content_settings =
218 new ContentSettingsObserver(render_view); 218 new ContentSettingsObserver(render_view);
219 if (chrome_observer_.get()) { 219 if (chrome_observer_.get()) {
220 content_settings->SetDefaultContentSettings( 220 content_settings->SetDefaultContentSettings(
221 chrome_observer_->default_content_settings()); 221 chrome_observer_->default_content_settings());
222 content_settings->SetImageSettingRules( 222 content_settings->SetContentSettingRules(
223 chrome_observer_->image_setting_rules()); 223 chrome_observer_->content_setting_rules());
224 } 224 }
225 new ExtensionHelper(render_view, extension_dispatcher_.get()); 225 new ExtensionHelper(render_view, extension_dispatcher_.get());
226 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 226 new PageLoadHistograms(render_view, histogram_snapshots_.get());
227 new PrintWebViewHelper(render_view); 227 new PrintWebViewHelper(render_view);
228 new SearchBox(render_view); 228 new SearchBox(render_view);
229 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 229 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
230 #if defined(ENABLE_SAFE_BROWSING) 230 #if defined(ENABLE_SAFE_BROWSING)
231 safe_browsing::MalwareDOMDetails::Create(render_view); 231 safe_browsing::MalwareDOMDetails::Create(render_view);
232 #endif 232 #endif
233 233
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 831 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
832 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 832 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
833 } 833 }
834 834
835 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 835 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
836 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 836 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
837 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 837 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
838 } 838 }
839 839
840 } // namespace chrome 840 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698