Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index 48ef654d6a3afafd77bbc59a40309e78a8768056..1791624cfa73dd07961aedeb6c96e9dd771cc6c1 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -780,7 +780,7 @@ std::unique_ptr<WebMediaPlayer> FrameLoaderClientImpl::createWebMediaPlayer(
HTMLMediaElementEncryptedMedia& encryptedMedia =
HTMLMediaElementEncryptedMedia::from(htmlMediaElement);
WebString sinkId(HTMLMediaElementAudioOutputDevice::sinkId(htmlMediaElement));
- return wrapUnique(webFrame->client()->createMediaPlayer(
+ return WTF::wrapUnique(webFrame->client()->createMediaPlayer(
source, client, &encryptedMedia, encryptedMedia.contentDecryptionModule(),
sinkId));
}
@@ -922,7 +922,7 @@ std::unique_ptr<WebServiceWorkerProvider>
FrameLoaderClientImpl::createServiceWorkerProvider() {
if (!m_webFrame->client())
return nullptr;
- return wrapUnique(m_webFrame->client()->createServiceWorkerProvider());
+ return WTF::wrapUnique(m_webFrame->client()->createServiceWorkerProvider());
}
bool FrameLoaderClientImpl::isControlledByServiceWorker(
@@ -949,7 +949,8 @@ FrameLoaderClientImpl::createApplicationCacheHost(
WebApplicationCacheHostClient* client) {
if (!m_webFrame->client())
return nullptr;
- return wrapUnique(m_webFrame->client()->createApplicationCacheHost(client));
+ return WTF::wrapUnique(
+ m_webFrame->client()->createApplicationCacheHost(client));
}
void FrameLoaderClientImpl::dispatchDidChangeManifest() {
« no previous file with comments | « third_party/WebKit/Source/web/ExternalPopupMenu.cpp ('k') | third_party/WebKit/Source/web/FullscreenController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698