| 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 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 net::SSLCertRequestInfo* cert_request_info, | 114 net::SSLCertRequestInfo* cert_request_info, |
| 115 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 115 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
| 116 virtual void AddNewCertificate( | 116 virtual void AddNewCertificate( |
| 117 net::URLRequest* request, | 117 net::URLRequest* request, |
| 118 net::X509Certificate* cert, | 118 net::X509Certificate* cert, |
| 119 int render_process_id, | 119 int render_process_id, |
| 120 int render_view_id) OVERRIDE; | 120 int render_view_id) OVERRIDE; |
| 121 virtual void RequestMediaAccessPermission( | 121 virtual void RequestMediaAccessPermission( |
| 122 const content::MediaStreamRequest* request, | 122 const content::MediaStreamRequest* request, |
| 123 const content::MediaResponseCallback& callback) OVERRIDE; | 123 const content::MediaResponseCallback& callback) OVERRIDE; |
| 124 virtual MediaObserver* GetMediaObserver() OVERRIDE; |
| 124 virtual void RequestDesktopNotificationPermission( | 125 virtual void RequestDesktopNotificationPermission( |
| 125 const GURL& source_origin, | 126 const GURL& source_origin, |
| 126 int callback_context, | 127 int callback_context, |
| 127 int render_process_id, | 128 int render_process_id, |
| 128 int render_view_id) OVERRIDE; | 129 int render_view_id) OVERRIDE; |
| 129 virtual WebKit::WebNotificationPresenter::Permission | 130 virtual WebKit::WebNotificationPresenter::Permission |
| 130 CheckDesktopNotificationPermission( | 131 CheckDesktopNotificationPermission( |
| 131 const GURL& origin, | 132 const GURL& origin, |
| 132 content::ResourceContext* context, | 133 content::ResourceContext* context, |
| 133 int render_process_id) OVERRIDE; | 134 int render_process_id) OVERRIDE; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 | 187 |
| 187 ShellBrowserContext* browser_context(); | 188 ShellBrowserContext* browser_context(); |
| 188 | 189 |
| 189 private: | 190 private: |
| 190 ShellBrowserMainParts* shell_browser_main_parts_; | 191 ShellBrowserMainParts* shell_browser_main_parts_; |
| 191 }; | 192 }; |
| 192 | 193 |
| 193 } // namespace content | 194 } // namespace content |
| 194 | 195 |
| 195 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ | 196 #endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |