| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/extensions/extension_process_manager.h" | 32 #include "chrome/browser/extensions/extension_process_manager.h" |
| 33 #include "chrome/browser/extensions/extension_service.h" | 33 #include "chrome/browser/extensions/extension_service.h" |
| 34 #include "chrome/browser/extensions/extension_web_ui.h" | 34 #include "chrome/browser/extensions/extension_web_ui.h" |
| 35 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 35 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
| 36 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 36 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
| 37 #include "chrome/browser/google/google_util.h" | 37 #include "chrome/browser/google/google_util.h" |
| 38 #include "chrome/browser/infobars/infobar_tab_helper.h" | 38 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 39 #include "chrome/browser/net/chrome_net_log.h" | 39 #include "chrome/browser/net/chrome_net_log.h" |
| 40 #include "chrome/browser/notifications/desktop_notification_service.h" | 40 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 41 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 41 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
| 42 #include "chrome/browser/pepper_gtalk_message_filter.h" |
| 42 #include "chrome/browser/platform_util.h" | 43 #include "chrome/browser/platform_util.h" |
| 43 #include "chrome/browser/prefs/pref_service.h" | 44 #include "chrome/browser/prefs/pref_service.h" |
| 44 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 45 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
| 45 #include "chrome/browser/prerender/prerender_manager.h" | 46 #include "chrome/browser/prerender/prerender_manager.h" |
| 46 #include "chrome/browser/prerender/prerender_manager_factory.h" | 47 #include "chrome/browser/prerender/prerender_manager_factory.h" |
| 47 #include "chrome/browser/prerender/prerender_tracker.h" | 48 #include "chrome/browser/prerender/prerender_tracker.h" |
| 48 #include "chrome/browser/printing/printing_message_filter.h" | 49 #include "chrome/browser/printing/printing_message_filter.h" |
| 49 #include "chrome/browser/profiles/profile.h" | 50 #include "chrome/browser/profiles/profile.h" |
| 50 #include "chrome/browser/profiles/profile_io_data.h" | 51 #include "chrome/browser/profiles/profile_io_data.h" |
| 51 #include "chrome/browser/profiles/profile_manager.h" | 52 #include "chrome/browser/profiles/profile_manager.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 65 #include "chrome/browser/user_style_sheet_watcher.h" | 66 #include "chrome/browser/user_style_sheet_watcher.h" |
| 66 #include "chrome/common/child_process_logging.h" | 67 #include "chrome/common/child_process_logging.h" |
| 67 #include "chrome/common/chrome_constants.h" | 68 #include "chrome/common/chrome_constants.h" |
| 68 #include "chrome/common/chrome_switches.h" | 69 #include "chrome/common/chrome_switches.h" |
| 69 #include "chrome/common/extensions/extension.h" | 70 #include "chrome/common/extensions/extension.h" |
| 70 #include "chrome/common/extensions/extension_set.h" | 71 #include "chrome/common/extensions/extension_set.h" |
| 71 #include "chrome/common/logging_chrome.h" | 72 #include "chrome/common/logging_chrome.h" |
| 72 #include "chrome/common/pref_names.h" | 73 #include "chrome/common/pref_names.h" |
| 73 #include "chrome/common/render_messages.h" | 74 #include "chrome/common/render_messages.h" |
| 74 #include "chrome/common/url_constants.h" | 75 #include "chrome/common/url_constants.h" |
| 76 #include "content/public/browser/browser_child_process_host.h" |
| 75 #include "content/public/browser/browser_main_parts.h" | 77 #include "content/public/browser/browser_main_parts.h" |
| 76 #include "content/public/browser/browser_url_handler.h" | 78 #include "content/public/browser/browser_url_handler.h" |
| 77 #include "content/public/browser/child_process_security_policy.h" | 79 #include "content/public/browser/child_process_security_policy.h" |
| 78 #include "content/public/browser/render_process_host.h" | 80 #include "content/public/browser/render_process_host.h" |
| 79 #include "content/public/browser/render_view_host.h" | 81 #include "content/public/browser/render_view_host.h" |
| 80 #include "content/public/browser/resource_context.h" | 82 #include "content/public/browser/resource_context.h" |
| 81 #include "content/public/browser/site_instance.h" | 83 #include "content/public/browser/site_instance.h" |
| 82 #include "content/public/browser/web_contents.h" | 84 #include "content/public/browser/web_contents.h" |
| 83 #include "content/public/browser/web_contents_view.h" | 85 #include "content/public/browser/web_contents_view.h" |
| 86 #include "content/public/common/child_process_host.h" |
| 84 #include "grit/generated_resources.h" | 87 #include "grit/generated_resources.h" |
| 85 #include "grit/ui_resources.h" | 88 #include "grit/ui_resources.h" |
| 86 #include "net/base/ssl_cert_request_info.h" | 89 #include "net/base/ssl_cert_request_info.h" |
| 87 #include "net/cookies/cookie_monster.h" | 90 #include "net/cookies/cookie_monster.h" |
| 88 #include "net/cookies/cookie_options.h" | 91 #include "net/cookies/cookie_options.h" |
| 89 #include "ui/base/l10n/l10n_util.h" | 92 #include "ui/base/l10n/l10n_util.h" |
| 90 #include "ui/base/resource/resource_bundle.h" | 93 #include "ui/base/resource/resource_bundle.h" |
| 91 #include "webkit/glue/webpreferences.h" | 94 #include "webkit/glue/webpreferences.h" |
| 92 | 95 |
| 93 #if defined(OS_WIN) | 96 #if defined(OS_WIN) |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 415 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
| 413 profile->IsOffTheRecord())); | 416 profile->IsOffTheRecord())); |
| 414 | 417 |
| 415 SendExtensionWebRequestStatusToHost(host); | 418 SendExtensionWebRequestStatusToHost(host); |
| 416 | 419 |
| 417 RendererContentSettingRules rules; | 420 RendererContentSettingRules rules; |
| 418 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); | 421 GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules); |
| 419 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); | 422 host->Send(new ChromeViewMsg_SetContentSettingRules(rules)); |
| 420 } | 423 } |
| 421 | 424 |
| 425 void ChromeContentBrowserClient::BrowserChildProcessHostCreated( |
| 426 content::BrowserChildProcessHost* host) { |
| 427 host->GetHost()->AddFilter(new PepperGtalkMessageFilter()); |
| 428 } |
| 429 |
| 422 content::WebUIControllerFactory* | 430 content::WebUIControllerFactory* |
| 423 ChromeContentBrowserClient::GetWebUIControllerFactory() { | 431 ChromeContentBrowserClient::GetWebUIControllerFactory() { |
| 424 return ChromeWebUIControllerFactory::GetInstance(); | 432 return ChromeWebUIControllerFactory::GetInstance(); |
| 425 } | 433 } |
| 426 | 434 |
| 427 GURL ChromeContentBrowserClient::GetEffectiveURL( | 435 GURL ChromeContentBrowserClient::GetEffectiveURL( |
| 428 content::BrowserContext* browser_context, const GURL& url) { | 436 content::BrowserContext* browser_context, const GURL& url) { |
| 429 Profile* profile = Profile::FromBrowserContext(browser_context); | 437 Profile* profile = Profile::FromBrowserContext(browser_context); |
| 430 // Get the effective URL for the given actual URL. If the URL is part of an | 438 // Get the effective URL for the given actual URL. If the URL is part of an |
| 431 // installed app, the effective URL is an extension URL with the ID of that | 439 // installed app, the effective URL is an extension URL with the ID of that |
| (...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1619 #if defined(USE_NSS) | 1627 #if defined(USE_NSS) |
| 1620 crypto::CryptoModuleBlockingPasswordDelegate* | 1628 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1621 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1629 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1622 const GURL& url) { | 1630 const GURL& url) { |
| 1623 return browser::NewCryptoModuleBlockingDialogDelegate( | 1631 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1624 browser::kCryptoModulePasswordKeygen, url.host()); | 1632 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1625 } | 1633 } |
| 1626 #endif | 1634 #endif |
| 1627 | 1635 |
| 1628 } // namespace chrome | 1636 } // namespace chrome |
| OLD | NEW |