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

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: Test fix. 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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme); 221 WebSecurityPolicy::registerURLSchemeAsSecure(extension_scheme);
222 } 222 }
223 223
224 void ChromeContentRendererClient::RenderViewCreated( 224 void ChromeContentRendererClient::RenderViewCreated(
225 content::RenderView* render_view) { 225 content::RenderView* render_view) {
226 ContentSettingsObserver* content_settings = 226 ContentSettingsObserver* content_settings =
227 new ContentSettingsObserver(render_view); 227 new ContentSettingsObserver(render_view);
228 if (chrome_observer_.get()) { 228 if (chrome_observer_.get()) {
229 content_settings->SetDefaultContentSettings( 229 content_settings->SetDefaultContentSettings(
230 chrome_observer_->default_content_settings()); 230 chrome_observer_->default_content_settings());
231 content_settings->SetImageSettingRules( 231 content_settings->SetContentSettingRules(
232 chrome_observer_->image_setting_rules()); 232 chrome_observer_->content_setting_rules());
233 } 233 }
234 new ExtensionHelper(render_view, extension_dispatcher_.get()); 234 new ExtensionHelper(render_view, extension_dispatcher_.get());
235 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 235 new PageLoadHistograms(render_view, histogram_snapshots_.get());
236 new PrintWebViewHelper(render_view); 236 new PrintWebViewHelper(render_view);
237 new SearchBox(render_view); 237 new SearchBox(render_view);
238 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 238 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
239 #if defined(ENABLE_SAFE_BROWSING) 239 #if defined(ENABLE_SAFE_BROWSING)
240 safe_browsing::MalwareDOMDetails::Create(render_view); 240 safe_browsing::MalwareDOMDetails::Create(render_view);
241 #endif 241 #endif
242 242
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 869
870 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() { 870 bool ChromeContentRendererClient::IsAdblockPlusWithWebRequestInstalled() {
871 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled(); 871 return extension_dispatcher_->IsAdblockPlusWithWebRequestInstalled();
872 } 872 }
873 873
874 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 874 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
875 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 875 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
876 } 876 }
877 877
878 } // namespace chrome 878 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698