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

Fix building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2015-06-26 12:04:15 +08:00
parent e6f3c4c22b
commit 637b642837
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
EventEmitter::EventEmitter() { EventEmitter::EventEmitter() {
} }
v8::Local<v8::Object> EventEmitter::CreateEvent(v8::Isolate* isolate, v8::Local<v8::Object> EventEmitter::CreateJSEvent(v8::Isolate* isolate,
content::WebContents* sender, content::WebContents* sender,
IPC::Message* message) { IPC::Message* message) {
v8::Local<v8::Object> event; v8::Local<v8::Object> event;

4
atom/browser/api/event_emitter.h
View file

@ -39,7 +39,7 @@ class EventEmitter : public Wrappable {
const Args&... args) { const Args&... args) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
v8::Local<v8::Object> event = CreateEvent(isolate(), sender, message); v8::Local<v8::Object> event = CreateJSEvent(isolate(), sender, message);
EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...); EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
return event->Get( return event->Get(
StringToV8(isolate(), "defaultPrevented"))->BooleanValue(); StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
@ -49,7 +49,7 @@ class EventEmitter : public Wrappable {
EventEmitter(); EventEmitter();
private: private:
v8::Local<v8::Object> CreateEvent(v8::Isolate* isolate, v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
content::WebContents* sender, content::WebContents* sender,
IPC::Message* message); IPC::Message* message);

2
atom/browser/browser_observer.h
View file

@ -8,9 +8,9 @@
#include <string> #include <string>
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "content/public/browser/client_certificate_delegate.h"
namespace content { namespace content {
class ClientCertificateDelegate;
class WebContents; class WebContents;
} }

6
atom/browser/native_window.h
View file

@ -248,6 +248,9 @@ class NativeWindow : public content::WebContentsObserver,
// Window icon. // Window icon.
gfx::ImageSkia icon_; gfx::ImageSkia icon_;
// Observers of this window.
ObserverList<NativeWindowObserver> observers_;
private: private:
// Schedule a notification unresponsive event. // Schedule a notification unresponsive event.
void ScheduleUnresponsiveEvent(int ms); void ScheduleUnresponsiveEvent(int ms);
@ -260,9 +263,6 @@ class NativeWindow : public content::WebContentsObserver,
const SkBitmap& bitmap, const SkBitmap& bitmap,
content::ReadbackResponse response); content::ReadbackResponse response);
// Observers of this window.
ObserverList<NativeWindowObserver> observers_;
// The windows has been closed. // The windows has been closed.
bool is_closed_; bool is_closed_;