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 | 7 |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 virtual const wchar_t* GetResourceDllName() OVERRIDE; | 246 virtual const wchar_t* GetResourceDllName() OVERRIDE; |
247 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 247 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
248 bool* success) OVERRIDE; | 248 bool* success) OVERRIDE; |
249 #endif | 249 #endif |
250 #if defined(USE_NSS) | 250 #if defined(USE_NSS) |
251 virtual | 251 virtual |
252 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( | 252 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( |
253 const GURL& url) OVERRIDE; | 253 const GURL& url) OVERRIDE; |
254 #endif | 254 #endif |
255 | 255 |
| 256 virtual bool IsWebRtcLoggingAllowed() OVERRIDE; |
| 257 virtual void UploadWebRtcLog(scoped_ptr<base::SharedMemory> shared_memory, |
| 258 uint32 length) OVERRIDE; |
| 259 |
256 private: | 260 private: |
257 // Set of origins that can use TCP/UDP private APIs from NaCl. | 261 // Set of origins that can use TCP/UDP private APIs from NaCl. |
258 std::set<std::string> allowed_socket_origins_; | 262 std::set<std::string> allowed_socket_origins_; |
259 | 263 |
260 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 264 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
261 }; | 265 }; |
262 | 266 |
263 } // namespace chrome | 267 } // namespace chrome |
264 | 268 |
265 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 269 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |