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/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "chrome/app/breakpad_mac.h" | 9 #include "chrome/app/breakpad_mac.h" |
10 #include "chrome/browser/browser_about_handler.h" | 10 #include "chrome/browser/browser_about_handler.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 #include "content/browser/plugin_process_host.h" | 62 #include "content/browser/plugin_process_host.h" |
63 #include "content/browser/renderer_host/browser_render_process_host.h" | 63 #include "content/browser/renderer_host/browser_render_process_host.h" |
64 #include "content/browser/renderer_host/render_view_host.h" | 64 #include "content/browser/renderer_host/render_view_host.h" |
65 #include "content/browser/resource_context.h" | 65 #include "content/browser/resource_context.h" |
66 #include "content/browser/site_instance.h" | 66 #include "content/browser/site_instance.h" |
67 #include "content/browser/ssl/ssl_cert_error_handler.h" | 67 #include "content/browser/ssl/ssl_cert_error_handler.h" |
68 #include "content/browser/ssl/ssl_client_auth_handler.h" | 68 #include "content/browser/ssl/ssl_client_auth_handler.h" |
69 #include "content/browser/tab_contents/tab_contents.h" | 69 #include "content/browser/tab_contents/tab_contents.h" |
70 #include "content/browser/tab_contents/tab_contents_view.h" | 70 #include "content/browser/tab_contents/tab_contents_view.h" |
71 #include "content/browser/worker_host/worker_process_host.h" | 71 #include "content/browser/worker_host/worker_process_host.h" |
72 #include "content/common/desktop_notification_messages.h" | |
73 #include "content/public/browser/browser_main_parts.h" | 72 #include "content/public/browser/browser_main_parts.h" |
74 #include "grit/generated_resources.h" | 73 #include "grit/generated_resources.h" |
75 #include "grit/ui_resources.h" | 74 #include "grit/ui_resources.h" |
76 #include "net/base/cookie_monster.h" | 75 #include "net/base/cookie_monster.h" |
77 #include "net/base/cookie_options.h" | 76 #include "net/base/cookie_options.h" |
78 #include "ui/base/l10n/l10n_util.h" | 77 #include "ui/base/l10n/l10n_util.h" |
79 #include "ui/base/resource/resource_bundle.h" | 78 #include "ui/base/resource/resource_bundle.h" |
80 | 79 |
81 #if defined(OS_WIN) | 80 #if defined(OS_WIN) |
82 #include "chrome/browser/chrome_browser_main_win.h" | 81 #include "chrome/browser/chrome_browser_main_win.h" |
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
852 return WebKit::WebNotificationPresenter::PermissionAllowed; | 851 return WebKit::WebNotificationPresenter::PermissionAllowed; |
853 | 852 |
854 // Fall back to the regular notification preferences, which works on an | 853 // Fall back to the regular notification preferences, which works on an |
855 // origin basis. | 854 // origin basis. |
856 return io_data->GetNotificationService() ? | 855 return io_data->GetNotificationService() ? |
857 io_data->GetNotificationService()->HasPermission(source_origin) : | 856 io_data->GetNotificationService()->HasPermission(source_origin) : |
858 WebKit::WebNotificationPresenter::PermissionNotAllowed; | 857 WebKit::WebNotificationPresenter::PermissionNotAllowed; |
859 } | 858 } |
860 | 859 |
861 void ChromeContentBrowserClient::ShowDesktopNotification( | 860 void ChromeContentBrowserClient::ShowDesktopNotification( |
862 const DesktopNotificationHostMsg_Show_Params& params, | 861 const content::ShowDesktopNotificationHostMsgParams& params, |
863 int render_process_id, | 862 int render_process_id, |
864 int render_view_id, | 863 int render_view_id, |
865 bool worker) { | 864 bool worker) { |
866 RenderViewHost* rvh = RenderViewHost::FromID( | 865 RenderViewHost* rvh = RenderViewHost::FromID( |
867 render_process_id, render_view_id); | 866 render_process_id, render_view_id); |
868 if (!rvh) { | 867 if (!rvh) { |
869 NOTREACHED(); | 868 NOTREACHED(); |
870 return; | 869 return; |
871 } | 870 } |
872 | 871 |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1061 #if defined(USE_NSS) | 1060 #if defined(USE_NSS) |
1062 crypto::CryptoModuleBlockingPasswordDelegate* | 1061 crypto::CryptoModuleBlockingPasswordDelegate* |
1063 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1062 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1064 const GURL& url) { | 1063 const GURL& url) { |
1065 return browser::NewCryptoModuleBlockingDialogDelegate( | 1064 return browser::NewCryptoModuleBlockingDialogDelegate( |
1066 browser::kCryptoModulePasswordKeygen, url.host()); | 1065 browser::kCryptoModulePasswordKeygen, url.host()); |
1067 } | 1066 } |
1068 #endif | 1067 #endif |
1069 | 1068 |
1070 } // namespace chrome | 1069 } // namespace chrome |
OLD | NEW |