Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 #include "public/platform/WebCommon.h" | 49 #include "public/platform/WebCommon.h" |
| 50 #include "public/platform/WebFileSystem.h" | 50 #include "public/platform/WebFileSystem.h" |
| 51 #include "public/platform/WebFileSystemType.h" | 51 #include "public/platform/WebFileSystemType.h" |
| 52 #include "public/platform/WebLoadingBehaviorFlag.h" | 52 #include "public/platform/WebLoadingBehaviorFlag.h" |
| 53 #include "public/platform/WebSecurityOrigin.h" | 53 #include "public/platform/WebSecurityOrigin.h" |
| 54 #include "public/platform/WebSetSinkIdCallbacks.h" | 54 #include "public/platform/WebSetSinkIdCallbacks.h" |
| 55 #include "public/platform/WebStorageQuotaCallbacks.h" | 55 #include "public/platform/WebStorageQuotaCallbacks.h" |
| 56 #include "public/platform/WebStorageQuotaType.h" | 56 #include "public/platform/WebStorageQuotaType.h" |
| 57 #include "public/platform/WebURLError.h" | 57 #include "public/platform/WebURLError.h" |
| 58 #include "public/platform/WebURLRequest.h" | 58 #include "public/platform/WebURLRequest.h" |
| 59 #include "public/web/WebContentSecurityPolicy.h" | |
| 59 #include <v8.h> | 60 #include <v8.h> |
| 60 | 61 |
| 61 namespace blink { | 62 namespace blink { |
| 62 | 63 |
| 63 enum class WebTreeScopeType; | 64 enum class WebTreeScopeType; |
| 64 class ServiceRegistry; | 65 class ServiceRegistry; |
| 65 class WebApplicationCacheHost; | 66 class WebApplicationCacheHost; |
| 66 class WebApplicationCacheHostClient; | 67 class WebApplicationCacheHostClient; |
| 67 class WebAppBannerClient; | 68 class WebAppBannerClient; |
| 68 class WebBluetooth; | 69 class WebBluetooth; |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 713 { | 714 { |
| 714 if (callbacks) { | 715 if (callbacks) { |
| 715 callbacks->onError(WebSetSinkIdError::NotSupported); | 716 callbacks->onError(WebSetSinkIdError::NotSupported); |
| 716 delete callbacks; | 717 delete callbacks; |
| 717 } | 718 } |
| 718 } | 719 } |
| 719 | 720 |
| 720 // Mojo ---------------------------------------------------------------- | 721 // Mojo ---------------------------------------------------------------- |
| 721 virtual ServiceRegistry* serviceRegistry() { return nullptr; } | 722 virtual ServiceRegistry* serviceRegistry() { return nullptr; } |
| 722 | 723 |
| 724 // Called when a new Content Security Policy is added to the frame's | |
| 725 // document. This can be trigerred by handling of HTTP headers, handling | |
|
Mike West
2016/05/11 06:21:04
Nit: s/trigerred/triggered/
Łukasz Anforowicz
2016/05/11 23:14:48
Done.
| |
| 726 // of <meta> element, or by inheriting CSP from the parent (in case of | |
| 727 // about:blank). | |
| 728 virtual void didAddContentSecurityPolicy(const WebString& headerValue, WebCo ntentSecurityPolicyType, WebContentSecurityPolicySource) { } | |
| 729 | |
| 723 protected: | 730 protected: |
| 724 virtual ~WebFrameClient() { } | 731 virtual ~WebFrameClient() { } |
| 725 }; | 732 }; |
| 726 | 733 |
| 727 } // namespace blink | 734 } // namespace blink |
| 728 | 735 |
| 729 #endif | 736 #endif |
| OLD | NEW |