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/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: Doc 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
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 host->channel()->AddFilter( 279 host->channel()->AddFilter(
280 new SearchProviderInstallStateMessageFilter(id, profile)); 280 new SearchProviderInstallStateMessageFilter(id, profile));
281 host->channel()->AddFilter(new SpellCheckMessageFilter(id)); 281 host->channel()->AddFilter(new SpellCheckMessageFilter(id));
282 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( 282 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter(
283 id, profile, profile->GetRequestContextForRenderProcess(id))); 283 id, profile, profile->GetRequestContextForRenderProcess(id)));
284 284
285 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 285 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
286 profile->IsOffTheRecord())); 286 profile->IsOffTheRecord()));
287 287
288 SendExtensionWebRequestStatusToHost(host); 288 SendExtensionWebRequestStatusToHost(host);
289 ContentSettingsForOneType settings;
290 HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
291 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
292 host->Send(new ChromeViewMsg_SetImageSettingRules(settings));
289 } 293 }
290 294
291 void ChromeContentBrowserClient::PluginProcessHostCreated( 295 void ChromeContentBrowserClient::PluginProcessHostCreated(
292 PluginProcessHost* host) { 296 PluginProcessHost* host) {
293 host->AddFilter(new ChromePluginMessageFilter(host)); 297 host->AddFilter(new ChromePluginMessageFilter(host));
294 } 298 }
295 299
296 void ChromeContentBrowserClient::WorkerProcessHostCreated( 300 void ChromeContentBrowserClient::WorkerProcessHostCreated(
297 WorkerProcessHost* host) { 301 WorkerProcessHost* host) {
298 host->AddFilter(new ChromeWorkerMessageFilter(host)); 302 host->AddFilter(new ChromeWorkerMessageFilter(host));
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 #if defined(USE_NSS) 992 #if defined(USE_NSS)
989 crypto::CryptoModuleBlockingPasswordDelegate* 993 crypto::CryptoModuleBlockingPasswordDelegate*
990 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 994 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
991 const GURL& url) { 995 const GURL& url) {
992 return browser::NewCryptoModuleBlockingDialogDelegate( 996 return browser::NewCryptoModuleBlockingDialogDelegate(
993 browser::kCryptoModulePasswordKeygen, url.host()); 997 browser::kCryptoModulePasswordKeygen, url.host());
994 } 998 }
995 #endif 999 #endif
996 1000
997 } // namespace chrome 1001 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/content_settings/host_content_settings_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698