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

Unified Diff: Source/web/WebEmbeddedWorkerImpl.cpp

Issue 968163003: Rename WorkerPermissionClient and friends to WorkerContentSettingsClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix Created 5 years, 9 months 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
« no previous file with comments | « Source/web/WebEmbeddedWorkerImpl.h ('k') | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebEmbeddedWorkerImpl.cpp
diff --git a/Source/web/WebEmbeddedWorkerImpl.cpp b/Source/web/WebEmbeddedWorkerImpl.cpp
index 2d63ef591dda7fb7f7685add2d904455ab39006c..6fa9e65600abb3e81824f2957ab1cf521e59b52d 100644
--- a/Source/web/WebEmbeddedWorkerImpl.cpp
+++ b/Source/web/WebEmbeddedWorkerImpl.cpp
@@ -60,12 +60,12 @@
#include "public/web/WebServiceWorkerNetworkProvider.h"
#include "public/web/WebSettings.h"
#include "public/web/WebView.h"
-#include "public/web/WebWorkerPermissionClientProxy.h"
+#include "public/web/WebWorkerContentSettingsClientProxy.h"
#include "web/ServiceWorkerGlobalScopeClientImpl.h"
#include "web/ServiceWorkerGlobalScopeProxy.h"
#include "web/WebDataSourceImpl.h"
#include "web/WebLocalFrameImpl.h"
-#include "web/WorkerPermissionClient.h"
+#include "web/WorkerContentSettingsClient.h"
#include "wtf/Functional.h"
namespace blink {
@@ -126,9 +126,9 @@ private:
RefPtr<ContentSecurityPolicy> m_contentSecurityPolicy;
};
-WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerPermissionClientProxy* permissionClient)
+WebEmbeddedWorker* WebEmbeddedWorker::create(WebServiceWorkerContextClient* client, WebWorkerContentSettingsClientProxy* contentSettingsClient)
{
- return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(permissionClient));
+ return new WebEmbeddedWorkerImpl(adoptPtr(client), adoptPtr(contentSettingsClient));
}
static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
@@ -137,9 +137,9 @@ static HashSet<WebEmbeddedWorkerImpl*>& runningWorkerInstances()
return set;
}
-WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient> client, PassOwnPtr<WebWorkerPermissionClientProxy> permissionClient)
+WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(PassOwnPtr<WebServiceWorkerContextClient> client, PassOwnPtr<WebWorkerContentSettingsClientProxy> ContentSettingsClient)
: m_workerContextClient(client)
- , m_permissionClient(permissionClient)
+ , m_contentSettingsClient(ContentSettingsClient)
, m_workerInspectorProxy(WorkerInspectorProxy::create())
, m_webView(0)
, m_mainFrame(0)
@@ -408,7 +408,7 @@ void WebEmbeddedWorkerImpl::startWorkerThread()
SecurityOrigin* starterOrigin = document->securityOrigin();
OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create();
- providePermissionClientToWorker(workerClients.get(), m_permissionClient.release());
+ provideContentSettingsClientToWorker(workerClients.get(), m_contentSettingsClient.release());
provideServiceWorkerGlobalScopeClientToWorker(workerClients.get(), ServiceWorkerGlobalScopeClientImpl::create(*m_workerContextClient));
provideServiceWorkerContainerClientToWorker(workerClients.get(), adoptPtr(m_workerContextClient->createServiceWorkerProvider()));
« no previous file with comments | « Source/web/WebEmbeddedWorkerImpl.h ('k') | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698