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

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

Issue 8538004: Take script URLs into account when applying script content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. 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
« no previous file with comments | « chrome/common/render_messages.cc ('k') | chrome/renderer/chrome_render_process_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 211 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
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->SetContentSettingRules(
221 chrome_observer_->default_content_settings()); 221 chrome_observer_->content_setting_rules());
222 content_settings->SetImageSettingRules(
223 chrome_observer_->image_setting_rules());
224 } 222 }
225 new ExtensionHelper(render_view, extension_dispatcher_.get()); 223 new ExtensionHelper(render_view, extension_dispatcher_.get());
226 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 224 new PageLoadHistograms(render_view, histogram_snapshots_.get());
227 new PrintWebViewHelper(render_view); 225 new PrintWebViewHelper(render_view);
228 new SearchBox(render_view); 226 new SearchBox(render_view);
229 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 227 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
230 #if defined(ENABLE_SAFE_BROWSING) 228 #if defined(ENABLE_SAFE_BROWSING)
231 safe_browsing::MalwareDOMDetails::Create(render_view); 229 safe_browsing::MalwareDOMDetails::Create(render_view);
232 #endif 230 #endif
233 231
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 802 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
805 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 803 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
806 } 804 }
807 805
808 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 806 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
809 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 807 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
810 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 808 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
811 } 809 }
812 810
813 } // namespace chrome 811 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/render_messages.cc ('k') | chrome/renderer/chrome_render_process_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698