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 <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 | 322 |
323 SendExtensionWebRequestStatusToHost(host); | 323 SendExtensionWebRequestStatusToHost(host); |
324 | 324 |
325 RendererContentSettingRules rules; | 325 RendererContentSettingRules rules; |
326 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); | 326 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); |
327 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 327 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
328 } | 328 } |
329 | 329 |
330 void ChromeContentBrowserClient::PluginProcessHostCreated( | 330 void ChromeContentBrowserClient::PluginProcessHostCreated( |
331 PluginProcessHost* host) { | 331 PluginProcessHost* host) { |
| 332 #if !defined(USE_AURA) |
332 host->AddFilter(new ChromePluginMessageFilter(host)); | 333 host->AddFilter(new ChromePluginMessageFilter(host)); |
| 334 #endif |
333 } | 335 } |
334 | 336 |
335 content::WebUIFactory* ChromeContentBrowserClient::GetWebUIFactory() { | 337 content::WebUIFactory* ChromeContentBrowserClient::GetWebUIFactory() { |
336 return ChromeWebUIFactory::GetInstance(); | 338 return ChromeWebUIFactory::GetInstance(); |
337 } | 339 } |
338 | 340 |
339 GURL ChromeContentBrowserClient::GetEffectiveURL( | 341 GURL ChromeContentBrowserClient::GetEffectiveURL( |
340 content::BrowserContext* browser_context, const GURL& url) { | 342 content::BrowserContext* browser_context, const GURL& url) { |
341 Profile* profile = Profile::FromBrowserContext(browser_context); | 343 Profile* profile = Profile::FromBrowserContext(browser_context); |
342 // Get the effective URL for the given actual URL. If the URL is part of an | 344 // Get the effective URL for the given actual URL. If the URL is part of an |
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 #if defined(USE_NSS) | 1118 #if defined(USE_NSS) |
1117 crypto::CryptoModuleBlockingPasswordDelegate* | 1119 crypto::CryptoModuleBlockingPasswordDelegate* |
1118 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1120 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1119 const GURL& url) { | 1121 const GURL& url) { |
1120 return browser::NewCryptoModuleBlockingDialogDelegate( | 1122 return browser::NewCryptoModuleBlockingDialogDelegate( |
1121 browser::kCryptoModulePasswordKeygen, url.host()); | 1123 browser::kCryptoModulePasswordKeygen, url.host()); |
1122 } | 1124 } |
1123 #endif | 1125 #endif |
1124 | 1126 |
1125 } // namespace chrome | 1127 } // namespace chrome |
OLD | NEW |