From 467e3b25b2836758223e526f8af06d684b9853d6 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 11 Dec 2015 20:11:22 +0800 Subject: [PATCH] EvenTypes => EventType --- atom/browser/api/atom_api_web_request.cc | 2 +- atom/browser/api/atom_api_web_request.h | 2 +- atom/browser/net/atom_network_delegate.cc | 2 +- atom/browser/net/atom_network_delegate.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/atom/browser/api/atom_api_web_request.cc b/atom/browser/api/atom_api_web_request.cc index a1b4df70c130..ab583d355f79 100644 --- a/atom/browser/api/atom_api_web_request.cc +++ b/atom/browser/api/atom_api_web_request.cc @@ -26,7 +26,7 @@ WebRequest::WebRequest(AtomBrowserContext* browser_context) WebRequest::~WebRequest() { } -template +template void WebRequest::SetListener(mate::Arguments* args) { scoped_ptr filter(new base::DictionaryValue); args->GetNext(filter.get()); diff --git a/atom/browser/api/atom_api_web_request.h b/atom/browser/api/atom_api_web_request.h index f156b5816195..0292a00104b4 100644 --- a/atom/browser/api/atom_api_web_request.h +++ b/atom/browser/api/atom_api_web_request.h @@ -29,7 +29,7 @@ class WebRequest : public mate::TrackableObject { explicit WebRequest(AtomBrowserContext* browser_context); ~WebRequest(); - template + template void SetListener(mate::Arguments* args); private: diff --git a/atom/browser/net/atom_network_delegate.cc b/atom/browser/net/atom_network_delegate.cc index c7a54ee66492..9d7c8e80991e 100644 --- a/atom/browser/net/atom_network_delegate.cc +++ b/atom/browser/net/atom_network_delegate.cc @@ -139,7 +139,7 @@ AtomNetworkDelegate::~AtomNetworkDelegate() { } void AtomNetworkDelegate::SetListenerInIO( - EventTypes type, + EventType type, scoped_ptr filter, const Listener& callback) { if (callback.is_null()) { diff --git a/atom/browser/net/atom_network_delegate.h b/atom/browser/net/atom_network_delegate.h index adc6935f2086..d6b2569787d4 100644 --- a/atom/browser/net/atom_network_delegate.h +++ b/atom/browser/net/atom_network_delegate.h @@ -28,7 +28,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate { using Listener = base::Callback; - enum EventTypes { + enum EventType { kInvalidEvent = 0, kOnBeforeRequest = 1 << 0, kOnBeforeSendHeaders = 1 << 1, @@ -62,7 +62,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate { AtomNetworkDelegate(); ~AtomNetworkDelegate() override; - void SetListenerInIO(EventTypes type, + void SetListenerInIO(EventType type, scoped_ptr filter, const Listener& callback); @@ -90,7 +90,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate { void OnCompleted(net::URLRequest* request, bool started) override; private: - std::map event_listener_map_; + std::map event_listener_map_; DISALLOW_COPY_AND_ASSIGN(AtomNetworkDelegate); };