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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "content/browser/content_browser_client.h" | 10 #include "content/browser/content_browser_client.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 Callback2<SSLCertErrorHandler*, bool>::Type* callback) OVERRIDE; | 52 Callback2<SSLCertErrorHandler*, bool>::Type* callback) OVERRIDE; |
53 virtual void ShowClientCertificateRequestDialog( | 53 virtual void ShowClientCertificateRequestDialog( |
54 int render_process_id, | 54 int render_process_id, |
55 int render_view_id, | 55 int render_view_id, |
56 SSLClientAuthHandler* handler) OVERRIDE; | 56 SSLClientAuthHandler* handler) OVERRIDE; |
57 virtual void AddNewCertificate( | 57 virtual void AddNewCertificate( |
58 net::URLRequest* request, | 58 net::URLRequest* request, |
59 net::X509Certificate* cert, | 59 net::X509Certificate* cert, |
60 int render_process_id, | 60 int render_process_id, |
61 int render_view_id) OVERRIDE; | 61 int render_view_id) OVERRIDE; |
| 62 virtual void RequestDesktopNotificationPermission( |
| 63 const GURL& source_origin, |
| 64 int callback_context, |
| 65 int render_process_id, |
| 66 int render_view_id) OVERRIDE; |
| 67 virtual WebKit::WebNotificationPresenter::Permission |
| 68 CheckDesktopNotificationPermission( |
| 69 const GURL& source_url, |
| 70 const content::ResourceContext& context) OVERRIDE; |
| 71 virtual void ShowDesktopNotification( |
| 72 const DesktopNotificationHostMsg_Show_Params& params, |
| 73 int render_process_id, |
| 74 int render_view_id, |
| 75 bool worker) OVERRIDE; |
| 76 virtual void CancelDesktopNotification( |
| 77 int render_process_id, |
| 78 int render_view_id, |
| 79 int notification_id) OVERRIDE; |
62 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 80 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
63 // Can return an optional fd for crash handling, otherwise returns -1. | 81 // Can return an optional fd for crash handling, otherwise returns -1. |
64 virtual int GetCrashSignalFD(const std::string& process_type) OVERRIDE; | 82 virtual int GetCrashSignalFD(const std::string& process_type) OVERRIDE; |
65 #endif | 83 #endif |
66 }; | 84 }; |
67 | 85 |
68 } // namespace chrome | 86 } // namespace chrome |
69 | 87 |
70 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 88 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |