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

Side by Side Diff: chrome/browser/chrome_content_browser_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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/app/breakpad_mac.h" 8 #include "chrome/app/breakpad_mac.h"
9 #include "chrome/browser/browser_about_handler.h" 9 #include "chrome/browser/browser_about_handler.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 id, profile, profile->GetRequestContextForRenderProcess(id))); 253 id, profile, profile->GetRequestContextForRenderProcess(id)));
254 host->channel()->AddFilter(new PrintingMessageFilter()); 254 host->channel()->AddFilter(new PrintingMessageFilter());
255 host->channel()->AddFilter( 255 host->channel()->AddFilter(
256 new SearchProviderInstallStateMessageFilter(id, profile)); 256 new SearchProviderInstallStateMessageFilter(id, profile));
257 host->channel()->AddFilter(new SpellCheckMessageFilter(id)); 257 host->channel()->AddFilter(new SpellCheckMessageFilter(id));
258 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( 258 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter(
259 id, profile, profile->GetRequestContextForRenderProcess(id))); 259 id, profile, profile->GetRequestContextForRenderProcess(id)));
260 260
261 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 261 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
262 profile->IsOffTheRecord())); 262 profile->IsOffTheRecord()));
263
264 ContentSettingsForOneType settings;
265 HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
266 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
267 host->Send(new ChromeViewMsg_SetImageSettingRules(settings));
263 } 268 }
264 269
265 void ChromeContentBrowserClient::PluginProcessHostCreated( 270 void ChromeContentBrowserClient::PluginProcessHostCreated(
266 PluginProcessHost* host) { 271 PluginProcessHost* host) {
267 host->AddFilter(new ChromePluginMessageFilter(host)); 272 host->AddFilter(new ChromePluginMessageFilter(host));
268 } 273 }
269 274
270 void ChromeContentBrowserClient::WorkerProcessHostCreated( 275 void ChromeContentBrowserClient::WorkerProcessHostCreated(
271 WorkerProcessHost* host) { 276 WorkerProcessHost* host) {
272 host->AddFilter(new ChromeWorkerMessageFilter(host)); 277 host->AddFilter(new ChromeWorkerMessageFilter(host));
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 #if defined(USE_NSS) 956 #if defined(USE_NSS)
952 crypto::CryptoModuleBlockingPasswordDelegate* 957 crypto::CryptoModuleBlockingPasswordDelegate*
953 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 958 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
954 const GURL& url) { 959 const GURL& url) {
955 return browser::NewCryptoModuleBlockingDialogDelegate( 960 return browser::NewCryptoModuleBlockingDialogDelegate(
956 browser::kCryptoModulePasswordKeygen, url.host()); 961 browser::kCryptoModulePasswordKeygen, url.host());
957 } 962 }
958 #endif 963 #endif
959 964
960 } // namespace chrome 965 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698