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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 #include "public/platform/BlameContext.h" | 48 #include "public/platform/BlameContext.h" |
| 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/WebSecurityOrigin.h" | 52 #include "public/platform/WebSecurityOrigin.h" |
| 53 #include "public/platform/WebSetSinkIdCallbacks.h" | 53 #include "public/platform/WebSetSinkIdCallbacks.h" |
| 54 #include "public/platform/WebStorageQuotaCallbacks.h" | 54 #include "public/platform/WebStorageQuotaCallbacks.h" |
| 55 #include "public/platform/WebStorageQuotaType.h" | 55 #include "public/platform/WebStorageQuotaType.h" |
| 56 #include "public/platform/WebURLError.h" | 56 #include "public/platform/WebURLError.h" |
| 57 #include "public/platform/WebURLRequest.h" | 57 #include "public/platform/WebURLRequest.h" |
| 58 #include <memory> | |
| 58 #include <v8.h> | 59 #include <v8.h> |
| 59 | 60 |
| 60 namespace blink { | 61 namespace blink { |
| 61 | 62 |
| 62 enum class WebTreeScopeType; | 63 enum class WebTreeScopeType; |
| 63 class WebApplicationCacheHost; | 64 class WebApplicationCacheHost; |
| 64 class WebApplicationCacheHostClient; | 65 class WebApplicationCacheHostClient; |
| 65 class WebAppBannerClient; | 66 class WebAppBannerClient; |
| 66 class WebBluetooth; | 67 class WebBluetooth; |
| 67 class WebColorChooser; | 68 class WebColorChooser; |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 714 virtual WebBluetooth* bluetooth() { return 0; } | 715 virtual WebBluetooth* bluetooth() { return 0; } |
| 715 | 716 |
| 716 // WebUSB -------------------------------------------------------------- | 717 // WebUSB -------------------------------------------------------------- |
| 717 virtual WebUSBClient* usbClient() { return nullptr; } | 718 virtual WebUSBClient* usbClient() { return nullptr; } |
| 718 | 719 |
| 719 | 720 |
| 720 // Audio Output Devices API -------------------------------------------- | 721 // Audio Output Devices API -------------------------------------------- |
| 721 | 722 |
| 722 // Checks that the given audio sink exists and is authorized. The result is provided via the callbacks. | 723 // Checks that the given audio sink exists and is authorized. The result is provided via the callbacks. |
| 723 // This method takes ownership of the callbacks pointer. | 724 // This method takes ownership of the callbacks pointer. |
| 724 virtual void checkIfAudioSinkExistsAndIsAuthorized(const WebString& sinkId, const WebSecurityOrigin&, WebSetSinkIdCallbacks*) { BLINK_ASSERT_NOT_REACHED(); } | 725 virtual void checkIfAudioSinkExistsAndIsAuthorized(const WebString& sinkId, const WebSecurityOrigin&, WebSetSinkIdCallbacks* callbacks) |
| 726 { | |
| 727 std::unique_ptr<WebSetSinkIdCallbacks> callback; | |
| 728 callback->onError(WebSetSinkIdError::NotSupported); | |
|
esprehn
2016/04/06 20:02:02
this doesn't really do anything I think?
You don'
liberato (no reviews please)
2016/04/06 21:02:34
i think that "std::unique... callback(callbacks)"
kotenkov
2016/04/07 06:03:28
You are correct. Okay, I've changed it to explicit
| |
| 729 } | |
| 725 | 730 |
| 726 protected: | 731 protected: |
| 727 virtual ~WebFrameClient() { } | 732 virtual ~WebFrameClient() { } |
| 728 }; | 733 }; |
| 729 | 734 |
| 730 } // namespace blink | 735 } // namespace blink |
| 731 | 736 |
| 732 #endif | 737 #endif |
| OLD | NEW |