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

Unified Diff: content/browser/devtools/protocol/service_worker_handler.h

Issue 2577233002: Revert of [DevTools] Migrate ServiceWorker domain to new generator. (Closed)
Patch Set: 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: content/browser/devtools/protocol/service_worker_handler.h
diff --git a/content/browser/devtools/protocol/service_worker_handler.h b/content/browser/devtools/protocol/service_worker_handler.h
index 359a08e05e947dc85fdbf0903d34ee17ea86d7f4..892a8c7ec031fbfbfea541a0956698e833390dcc 100644
--- a/content/browser/devtools/protocol/service_worker_handler.h
+++ b/content/browser/devtools/protocol/service_worker_handler.h
@@ -11,11 +11,18 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "content/browser/devtools/protocol/service_worker.h"
+#include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
#include "content/browser/devtools/service_worker_devtools_agent_host.h"
#include "content/browser/devtools/service_worker_devtools_manager.h"
#include "content/browser/service_worker/service_worker_context_observer.h"
#include "content/browser/service_worker/service_worker_info.h"
+#include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_agent_host_client.h"
+
+// Windows headers will redefine SendMessage.
+#ifdef SendMessage
+#undef SendMessage
+#endif
namespace content {
@@ -23,32 +30,37 @@
class ServiceWorkerContextWatcher;
class ServiceWorkerContextWrapper;
-namespace protocol {
+namespace devtools {
+namespace service_worker {
-class ServiceWorkerHandler : public ServiceWorker::Backend {
+class ServiceWorkerHandler {
public:
+ typedef DevToolsProtocolClient::Response Response;
+
ServiceWorkerHandler();
- ~ServiceWorkerHandler() override;
+ ~ServiceWorkerHandler();
- void Wire(UberDispatcher*);
void SetRenderFrameHost(RenderFrameHostImpl* render_frame_host);
+ void SetClient(std::unique_ptr<Client> client);
+ void Detached();
- Response Enable() override;
- Response Disable() override;
- Response Unregister(const std::string& scope_url) override;
- Response StartWorker(const std::string& scope_url) override;
- Response SkipWaiting(const std::string& scope_url) override;
- Response StopWorker(const std::string& version_id) override;
- Response UpdateRegistration(const std::string& scope_url) override;
- Response InspectWorker(const std::string& version_id) override;
- Response SetForceUpdateOnPageLoad(bool force_update_on_page_load) override;
+ // Protocol 'service worker' domain implementation.
+ Response Enable();
+ Response Disable();
+ Response Unregister(const std::string& scope_url);
+ Response StartWorker(const std::string& scope_url);
+ Response SkipWaiting(const std::string& scope_url);
+ Response StopWorker(const std::string& version_id);
+ Response UpdateRegistration(const std::string& scope_url);
+ Response InspectWorker(const std::string& version_id);
+ Response SetForceUpdateOnPageLoad(bool force_update_on_page_load);
Response DeliverPushMessage(const std::string& origin,
const std::string& registration_id,
- const std::string& data) override;
+ const std::string& data);
Response DispatchSyncEvent(const std::string& origin,
const std::string& registration_id,
const std::string& tag,
- bool last_chance) override;
+ bool last_chance);
private:
void OnWorkerRegistrationUpdated(
@@ -63,7 +75,7 @@
void ClearForceUpdate();
scoped_refptr<ServiceWorkerContextWrapper> context_;
- std::unique_ptr<ServiceWorker::Frontend> frontend_;
+ std::unique_ptr<Client> client_;
bool enabled_;
scoped_refptr<ServiceWorkerContextWatcher> context_watcher_;
RenderFrameHostImpl* render_frame_host_;
@@ -73,7 +85,8 @@
DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandler);
};
-} // namespace protocol
+} // namespace service_worker
+} // namespace devtools
} // namespace content
#endif // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_

Powered by Google App Engine
This is Rietveld 408576698