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 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 <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 int render_process_id, | 120 int render_process_id, |
121 int render_view_id, | 121 int render_view_id, |
122 const net::HttpNetworkSession* network_session, | 122 const net::HttpNetworkSession* network_session, |
123 net::SSLCertRequestInfo* cert_request_info, | 123 net::SSLCertRequestInfo* cert_request_info, |
124 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; | 124 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; |
125 virtual void AddNewCertificate( | 125 virtual void AddNewCertificate( |
126 net::URLRequest* request, | 126 net::URLRequest* request, |
127 net::X509Certificate* cert, | 127 net::X509Certificate* cert, |
128 int render_process_id, | 128 int render_process_id, |
129 int render_view_id) OVERRIDE; | 129 int render_view_id) OVERRIDE; |
130 virtual void RequestMediaAccessPermission( | |
131 const content::MediaStreamRequest* request, | |
132 const content::MediaResponseCallback& callback) OVERRIDE; | |
133 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; | 130 virtual content::MediaObserver* GetMediaObserver() OVERRIDE; |
134 virtual void RequestDesktopNotificationPermission( | 131 virtual void RequestDesktopNotificationPermission( |
135 const GURL& source_origin, | 132 const GURL& source_origin, |
136 int callback_context, | 133 int callback_context, |
137 int render_process_id, | 134 int render_process_id, |
138 int render_view_id) OVERRIDE; | 135 int render_view_id) OVERRIDE; |
139 virtual WebKit::WebNotificationPresenter::Permission | 136 virtual WebKit::WebNotificationPresenter::Permission |
140 CheckDesktopNotificationPermission( | 137 CheckDesktopNotificationPermission( |
141 const GURL& source_origin, | 138 const GURL& source_origin, |
142 content::ResourceContext* context, | 139 content::ResourceContext* context, |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 private: | 193 private: |
197 // Set of origins that can use TCP/UDP private APIs from NaCl. | 194 // Set of origins that can use TCP/UDP private APIs from NaCl. |
198 std::set<std::string> allowed_socket_origins_; | 195 std::set<std::string> allowed_socket_origins_; |
199 | 196 |
200 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 197 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
201 }; | 198 }; |
202 | 199 |
203 } // namespace chrome | 200 } // namespace chrome |
204 | 201 |
205 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 202 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |