Skip to content

Commit

Permalink
chore: remove native_mate
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Jan 9, 2020
1 parent 5357c7d commit 4a0ec9c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
14 changes: 6 additions & 8 deletions shell/browser/api/atom_api_service_worker_context.cc
Expand Up @@ -11,11 +11,10 @@
#include "content/public/browser/console_message.h"
#include "content/public/browser/storage_partition.h"
#include "gin/data_object_builder.h"
#include "native_mate/converter.h"
#include "native_mate/dictionary.h"
#include "native_mate/handle.h"
#include "gin/handle.h"
#include "shell/browser/atom_browser_context.h"
#include "shell/common/gin_converters/value_converter.h"
#include "shell/common/gin_helper/dictionary.h"
#include "shell/common/gin_helper/object_template_builder.h"
#include "shell/common/node_includes.h"

Expand Down Expand Up @@ -113,7 +112,6 @@ v8::Local<v8::Value> ServiceWorkerContext::GetAllRunningWorkerInfo(
ServiceWorkerRunningInfoToDict(isolate, std::move(iter->second)));
}
return builder.Build();
;
}

v8::Local<v8::Value> ServiceWorkerContext::GetWorkerInfoFromID(
Expand All @@ -131,18 +129,18 @@ v8::Local<v8::Value> ServiceWorkerContext::GetWorkerInfoFromID(
}

// static
mate::Handle<ServiceWorkerContext> ServiceWorkerContext::Create(
gin::Handle<ServiceWorkerContext> ServiceWorkerContext::Create(
v8::Isolate* isolate,
AtomBrowserContext* browser_context) {
return mate::CreateHandle(isolate,
new ServiceWorkerContext(isolate, browser_context));
return gin::CreateHandle(isolate,
new ServiceWorkerContext(isolate, browser_context));
}

// static
void ServiceWorkerContext::BuildPrototype(
v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype) {
prototype->SetClassName(mate::StringToV8(isolate, "ServiceWorkerContext"));
prototype->SetClassName(gin::StringToV8(isolate, "ServiceWorkerContext"));
gin_helper::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
.SetMethod("getAllRunning",
&ServiceWorkerContext::GetAllRunningWorkerInfo)
Expand Down
4 changes: 2 additions & 2 deletions shell/browser/api/atom_api_service_worker_context.h
Expand Up @@ -7,7 +7,7 @@

#include "content/public/browser/service_worker_context.h"
#include "content/public/browser/service_worker_context_observer.h"
#include "native_mate/handle.h"
#include "gin/handle.h"
#include "shell/common/gin_helper/trackable_object.h"

namespace electron {
Expand All @@ -20,7 +20,7 @@ class ServiceWorkerContext
: public gin_helper::TrackableObject<ServiceWorkerContext>,
public content::ServiceWorkerContextObserver {
public:
static mate::Handle<ServiceWorkerContext> Create(
static gin::Handle<ServiceWorkerContext> Create(
v8::Isolate* isolate,
AtomBrowserContext* browser_context);

Expand Down

0 comments on commit 4a0ec9c

Please sign in to comment.