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

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: Updated contentSettings.html. 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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme); 218 WebSecurityPolicy::registerURLSchemeAsSecure(chrome_ui_scheme);
219 219
220 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme)); 220 WebString extension_scheme(ASCIIToUTF16(chrome::kExtensionScheme));
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()) {
229 content_settings->SetImageSettingRules(
230 chrome_observer_->image_setting_rules());
231 }
228 new ExtensionHelper(render_view, extension_dispatcher_.get()); 232 new ExtensionHelper(render_view, extension_dispatcher_.get());
229 new PageLoadHistograms(render_view, histogram_snapshots_.get()); 233 new PageLoadHistograms(render_view, histogram_snapshots_.get());
230 new PrintWebViewHelper(render_view); 234 new PrintWebViewHelper(render_view);
231 new SearchBox(render_view); 235 new SearchBox(render_view);
232 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get()); 236 spellcheck_provider_ = new SpellCheckProvider(render_view, spellcheck_.get());
233 #if defined(ENABLE_SAFE_BROWSING) 237 #if defined(ENABLE_SAFE_BROWSING)
234 safe_browsing::MalwareDOMDetails::Create(render_view); 238 safe_browsing::MalwareDOMDetails::Create(render_view);
235 #endif 239 #endif
236 240
237 PasswordAutofillManager* password_autofill_manager = 241 PasswordAutofillManager* password_autofill_manager =
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 it != extensions.end(); ++it) { 864 it != extensions.end(); ++it) {
861 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) && 865 if (it->second->HasAPIPermission(ExtensionAPIPermission::kExperimental) &&
862 it->second->name().find("Adblock") != std::string::npos && 866 it->second->name().find("Adblock") != std::string::npos &&
863 it->second->name().find("Plus") != std::string::npos) 867 it->second->name().find("Plus") != std::string::npos)
864 return true; 868 return true;
865 } 869 }
866 return false; 870 return false;
867 } 871 }
868 872
869 } // namespace chrome 873 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698