OLD | NEW |
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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 id, profile, profile->GetRequestContextForRenderProcess(id))); | 257 id, profile, profile->GetRequestContextForRenderProcess(id))); |
258 host->channel()->AddFilter(new PrintingMessageFilter()); | 258 host->channel()->AddFilter(new PrintingMessageFilter()); |
259 host->channel()->AddFilter( | 259 host->channel()->AddFilter( |
260 new SearchProviderInstallStateMessageFilter(id, profile)); | 260 new SearchProviderInstallStateMessageFilter(id, profile)); |
261 host->channel()->AddFilter(new SpellCheckMessageFilter(id)); | 261 host->channel()->AddFilter(new SpellCheckMessageFilter(id)); |
262 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( | 262 host->channel()->AddFilter(new ChromeBenchmarkingMessageFilter( |
263 id, profile, profile->GetRequestContextForRenderProcess(id))); | 263 id, profile, profile->GetRequestContextForRenderProcess(id))); |
264 | 264 |
265 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 265 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
266 profile->IsOffTheRecord())); | 266 profile->IsOffTheRecord())); |
| 267 |
| 268 ContentSettingsForOneType settings; |
| 269 HostContentSettingsMap* map = profile->GetHostContentSettingsMap(); |
| 270 map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings); |
| 271 host->Send(new ChromeViewMsg_SetImageSettingRules(settings)); |
267 } | 272 } |
268 | 273 |
269 void ChromeContentBrowserClient::PluginProcessHostCreated( | 274 void ChromeContentBrowserClient::PluginProcessHostCreated( |
270 PluginProcessHost* host) { | 275 PluginProcessHost* host) { |
271 host->AddFilter(new ChromePluginMessageFilter(host)); | 276 host->AddFilter(new ChromePluginMessageFilter(host)); |
272 } | 277 } |
273 | 278 |
274 void ChromeContentBrowserClient::WorkerProcessHostCreated( | 279 void ChromeContentBrowserClient::WorkerProcessHostCreated( |
275 WorkerProcessHost* host) { | 280 WorkerProcessHost* host) { |
276 host->AddFilter(new ChromeWorkerMessageFilter(host)); | 281 host->AddFilter(new ChromeWorkerMessageFilter(host)); |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
955 #if defined(USE_NSS) | 960 #if defined(USE_NSS) |
956 crypto::CryptoModuleBlockingPasswordDelegate* | 961 crypto::CryptoModuleBlockingPasswordDelegate* |
957 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 962 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
958 const GURL& url) { | 963 const GURL& url) { |
959 return browser::NewCryptoModuleBlockingDialogDelegate( | 964 return browser::NewCryptoModuleBlockingDialogDelegate( |
960 browser::kCryptoModulePasswordKeygen, url.host()); | 965 browser::kCryptoModulePasswordKeygen, url.host()); |
961 } | 966 } |
962 #endif | 967 #endif |
963 | 968 |
964 } // namespace chrome | 969 } // namespace chrome |
OLD | NEW |