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

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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 210 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
211 } 211 }
212 212
213 void ChromeContentRendererClient::RenderViewCreated( 213 void ChromeContentRendererClient::RenderViewCreated(
214 content::RenderView* render_view) { 214 content::RenderView* render_view) {
215 ContentSettingsObserver* content_settings = 215 ContentSettingsObserver* content_settings =
216 new ContentSettingsObserver(render_view); 216 new ContentSettingsObserver(render_view);
217 if (chrome_observer_.get()) { 217 if (chrome_observer_.get()) {
218 content_settings->SetDefaultContentSettings( 218 content_settings->SetDefaultContentSettings(
219 chrome_observer_->default_content_settings()); 219 chrome_observer_->default_content_settings());
220 content_settings->SetImageSettingRules( 220 content_settings->SetContentSettingRules(
221 chrome_observer_->image_setting_rules()); 221 chrome_observer_->content_setting_rules());
222 } 222 }
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
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 833
834 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() { 834 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
835 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled(); 835 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled();
836 } 836 }
837 837
838 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 838 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
839 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 839 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
840 } 840 }
841 841
842 } // namespace chrome 842 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698