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

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: Rebased. 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 id, profile, profile->GetRequestContextForRenderProcess(id))); 251 id, profile, profile->GetRequestContextForRenderProcess(id)));
252 host->channel()->AddFilter(new PrintingMessageFilter()); 252 host->channel()->AddFilter(new PrintingMessageFilter());
253 host->channel()->AddFilter( 253 host->channel()->AddFilter(
254 new SearchProviderInstallStateMessageFilter(id, profile)); 254 new SearchProviderInstallStateMessageFilter(id, profile));
255 host->channel()->AddFilter(new SpellCheckMessageFilter(id)); 255 host->channel()->AddFilter(new SpellCheckMessageFilter(id));
256 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( 256 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter(
257 id, profile, profile->GetRequestContextForRenderProcess(id))); 257 id, profile, profile->GetRequestContextForRenderProcess(id)));
258 258
259 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 259 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
260 profile->IsOffTheRecord())); 260 profile->IsOffTheRecord()));
261
262 ContentSettingsForOneType settings;
263 HostContentSettingsMap* map =
264 profile->GetHostContentSettingsMap();
265 map->GetSettingsForOneType(
266 CONTENT_SETTINGS_TYPE_IMAGES, "",
267 &settings);
268 settings.push_back(ContentSettingPatternSourceTuple(
269 ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(),
270 map->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_IMAGES), "", false));
271 host->Send(new ChromeViewMsg_SetImageSettingRules(settings));
261 } 272 }
262 273
263 void ChromeContentBrowserClient::PluginProcessHostCreated( 274 void ChromeContentBrowserClient::PluginProcessHostCreated(
264 PluginProcessHost* host) { 275 PluginProcessHost* host) {
265 host->AddFilter(new ChromePluginMessageFilter(host)); 276 host->AddFilter(new ChromePluginMessageFilter(host));
266 } 277 }
267 278
268 void ChromeContentBrowserClient::WorkerProcessHostCreated( 279 void ChromeContentBrowserClient::WorkerProcessHostCreated(
269 WorkerProcessHost* host) { 280 WorkerProcessHost* host) {
270 host->AddFilter(new ChromeWorkerMessageFilter(host)); 281 host->AddFilter(new ChromeWorkerMessageFilter(host));
(...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
945 #if defined(USE_NSS) 956 #if defined(USE_NSS)
946 crypto::CryptoModuleBlockingPasswordDelegate* 957 crypto::CryptoModuleBlockingPasswordDelegate*
947 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 958 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
948 const GURL& url) { 959 const GURL& url) {
949 return browser::NewCryptoModuleBlockingDialogDelegate( 960 return browser::NewCryptoModuleBlockingDialogDelegate(
950 browser::kCryptoModulePasswordKeygen, url.host()); 961 browser::kCryptoModulePasswordKeygen, url.host());
951 } 962 }
952 #endif 963 #endif
953 964
954 } // namespace chrome 965 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698