Chromium Code Reviews| 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> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/callback_forward.h" | 13 #include "base/callback_forward.h" |
| 14 #include "base/memory/linked_ptr.h" | 14 #include "base/memory/linked_ptr.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/memory/scoped_vector.h" | 16 #include "base/memory/scoped_vector.h" |
| 17 #include "base/shared_memory.h" | |
| 17 #include "content/public/browser/file_descriptor_info.h" | 18 #include "content/public/browser/file_descriptor_info.h" |
| 18 #include "content/public/common/content_client.h" | 19 #include "content/public/common/content_client.h" |
| 19 #include "content/public/common/socket_permission_request.h" | 20 #include "content/public/common/socket_permission_request.h" |
| 20 #include "content/public/common/window_container_type.h" | 21 #include "content/public/common/window_container_type.h" |
| 21 #include "net/base/mime_util.h" | 22 #include "net/base/mime_util.h" |
| 22 #include "net/cookies/canonical_cookie.h" | 23 #include "net/cookies/canonical_cookie.h" |
| 23 #include "net/url_request/url_request_job_factory.h" | 24 #include "net/url_request/url_request_job_factory.h" |
| 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h" | 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresen ter.h" |
| 25 #include "webkit/glue/resource_type.h" | 26 #include "webkit/glue/resource_type.h" |
| 26 | 27 |
| 27 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 28 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 28 #include "base/posix/global_descriptors.h" | 29 #include "base/posix/global_descriptors.h" |
| 29 #endif | 30 #endif |
| 30 | 31 |
| 31 class CommandLine; | 32 class CommandLine; |
| 32 class GURL; | 33 class GURL; |
| 33 struct WebPreferences; | 34 struct WebPreferences; |
| 34 | 35 |
| 35 namespace base { | 36 namespace base { |
| 36 class FilePath; | 37 class FilePath; |
| 38 class SharedMemory; | |
| 37 } | 39 } |
| 40 | |
| 38 namespace crypto { | 41 namespace crypto { |
| 39 class CryptoModuleBlockingPasswordDelegate; | 42 class CryptoModuleBlockingPasswordDelegate; |
| 40 } | 43 } |
| 41 | 44 |
| 42 namespace gfx { | 45 namespace gfx { |
| 43 class ImageSkia; | 46 class ImageSkia; |
| 44 } | 47 } |
| 45 | 48 |
| 46 namespace net { | 49 namespace net { |
| 47 class CookieOptions; | 50 class CookieOptions; |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 540 bool* success) {} | 543 bool* success) {} |
| 541 #endif | 544 #endif |
| 542 | 545 |
| 543 #if defined(USE_NSS) | 546 #if defined(USE_NSS) |
| 544 // Return a delegate to authenticate and unlock |module|. | 547 // Return a delegate to authenticate and unlock |module|. |
| 545 // This is called on a worker thread. | 548 // This is called on a worker thread. |
| 546 virtual | 549 virtual |
| 547 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( | 550 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( |
| 548 const GURL& url); | 551 const GURL& url); |
| 549 #endif | 552 #endif |
| 553 | |
| 554 // Returns whether WebRTC logging is allowed or not. It can return false for | |
| 555 // example if not supported, if any initialization fails or if maximum number | |
| 556 // of simultaneos logs is reached already. | |
|
vabr (Chromium)
2013/05/13 08:55:50
typo: simultaneos -> simultaneous
Henrik Grunell
2013/05/14 13:48:50
Done.
| |
| 557 virtual bool IsWebRtcLoggingAllowed(); | |
| 558 | |
| 559 // Tells the embedder to upload a WebRTC log file. | |
| 560 virtual void UploadWebRtcLog(scoped_ptr<base::SharedMemory> shared_memory, | |
| 561 uint32 length) {} | |
| 550 }; | 562 }; |
| 551 | 563 |
| 552 } // namespace content | 564 } // namespace content |
| 553 | 565 |
| 554 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ | 566 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |