mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

EvenTypes => EventType

Browse source
This commit is contained in:
Cheng Zhao 2015-12-11 20:11:22 +08:00
parent 62f4b25cf9
commit 467e3b25b2
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_web_request.cc
View file

@ -26,7 +26,7 @@ WebRequest::WebRequest(AtomBrowserContext* browser_context)
WebRequest::~WebRequest() { WebRequest::~WebRequest() {
} }
template<AtomNetworkDelegate::EventTypes type> template<AtomNetworkDelegate::EventType type>
void WebRequest::SetListener(mate::Arguments* args) { void WebRequest::SetListener(mate::Arguments* args) {
scoped_ptr<base::DictionaryValue> filter(new base::DictionaryValue); scoped_ptr<base::DictionaryValue> filter(new base::DictionaryValue);
args->GetNext(filter.get()); args->GetNext(filter.get());

2
atom/browser/api/atom_api_web_request.h
View file

@ -29,7 +29,7 @@ class WebRequest : public mate::TrackableObject<WebRequest> {
explicit WebRequest(AtomBrowserContext* browser_context); explicit WebRequest(AtomBrowserContext* browser_context);
~WebRequest(); ~WebRequest();
template<AtomNetworkDelegate::EventTypes Event> template<AtomNetworkDelegate::EventType Event>
void SetListener(mate::Arguments* args); void SetListener(mate::Arguments* args);
private: private:

2
atom/browser/net/atom_network_delegate.cc
View file

@ -139,7 +139,7 @@ AtomNetworkDelegate::~AtomNetworkDelegate() {
} }
void AtomNetworkDelegate::SetListenerInIO( void AtomNetworkDelegate::SetListenerInIO(
EventTypes type, EventType type,
scoped_ptr<base::DictionaryValue> filter, scoped_ptr<base::DictionaryValue> filter,
const Listener& callback) { const Listener& callback) {
if (callback.is_null()) { if (callback.is_null()) {

6
atom/browser/net/atom_network_delegate.h
View file

@ -28,7 +28,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
using Listener = using Listener =
base::Callback<BlockingResponse(const base::DictionaryValue&)>; base::Callback<BlockingResponse(const base::DictionaryValue&)>;
enum EventTypes { enum EventType {
kInvalidEvent = 0, kInvalidEvent = 0,
kOnBeforeRequest = 1 << 0, kOnBeforeRequest = 1 << 0,
kOnBeforeSendHeaders = 1 << 1, kOnBeforeSendHeaders = 1 << 1,
@ -62,7 +62,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
AtomNetworkDelegate(); AtomNetworkDelegate();
~AtomNetworkDelegate() override; ~AtomNetworkDelegate() override;
void SetListenerInIO(EventTypes type, void SetListenerInIO(EventType type,
scoped_ptr<base::DictionaryValue> filter, scoped_ptr<base::DictionaryValue> filter,
const Listener& callback); const Listener& callback);
@ -90,7 +90,7 @@ class AtomNetworkDelegate : public brightray::NetworkDelegate {
void OnCompleted(net::URLRequest* request, bool started) override; void OnCompleted(net::URLRequest* request, bool started) override;
private: private:
std::map<EventTypes, ListenerInfo> event_listener_map_; std::map<EventType, ListenerInfo> event_listener_map_;
DISALLOW_COPY_AND_ASSIGN(AtomNetworkDelegate); DISALLOW_COPY_AND_ASSIGN(AtomNetworkDelegate);
}; };