| 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_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 26 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 27 #include "base/posix/global_descriptors.h" | 27 #include "base/posix/global_descriptors.h" |
| 28 #endif | 28 #endif |
| 29 | 29 |
| 30 class CommandLine; | 30 class CommandLine; |
| 31 class GURL; | 31 class GURL; |
| 32 | 32 |
| 33 namespace base { | 33 namespace base { |
| 34 class FilePath; | 34 class FilePath; |
| 35 class SharedMemory; |
| 35 } | 36 } |
| 37 |
| 36 namespace crypto { | 38 namespace crypto { |
| 37 class CryptoModuleBlockingPasswordDelegate; | 39 class CryptoModuleBlockingPasswordDelegate; |
| 38 } | 40 } |
| 39 | 41 |
| 40 namespace gfx { | 42 namespace gfx { |
| 41 class ImageSkia; | 43 class ImageSkia; |
| 42 } | 44 } |
| 43 | 45 |
| 44 namespace net { | 46 namespace net { |
| 45 class CookieOptions; | 47 class CookieOptions; |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 bool* success) {} | 518 bool* success) {} |
| 517 #endif | 519 #endif |
| 518 | 520 |
| 519 #if defined(USE_NSS) | 521 #if defined(USE_NSS) |
| 520 // Return a delegate to authenticate and unlock |module|. | 522 // Return a delegate to authenticate and unlock |module|. |
| 521 // This is called on a worker thread. | 523 // This is called on a worker thread. |
| 522 virtual | 524 virtual |
| 523 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( | 525 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( |
| 524 const GURL& url); | 526 const GURL& url); |
| 525 #endif | 527 #endif |
| 528 |
| 529 // Asks the embedder to upload a WebRTC log file. Returns true if the embedder |
| 530 // will upload the file and take ownership of |shared_memory|. |
| 531 virtual bool UploadWebRtcLog(base::SharedMemory* shared_memory, |
| 532 uint32 length); |
| 526 }; | 533 }; |
| 527 | 534 |
| 528 } // namespace content | 535 } // namespace content |
| 529 | 536 |
| 530 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 537 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |