Index: mojo/services/native_viewport/native_viewport_x11.cc |
diff --git a/mojo/services/native_viewport/native_viewport_x11.cc b/mojo/services/native_viewport/native_viewport_x11.cc |
index be7d1cd79442637531c07ce0942a4aeb18db4df5..f34fc48efa6f4bb99b34cb7a4353068bb17a9af4 100644 |
--- a/mojo/services/native_viewport/native_viewport_x11.cc |
+++ b/mojo/services/native_viewport/native_viewport_x11.cc |
@@ -53,8 +53,10 @@ class NativeViewportX11 : public NativeViewport, |
atom_wm_delete_window_ = XInternAtom(display, "WM_DELETE_WINDOW", 1); |
XSetWMProtocols(display, window_, &atom_wm_delete_window_, 1); |
- // Assumes there is only one instance per process. |
- event_source_ = ui::PlatformEventSource::CreateDefault(); |
+ event_source_.reset(ui::PlatformEventSource::GetInstance()); |
+ if (!event_source_.get()) { |
Ben Goodger (Google)
2014/05/02 22:58:02
nit: no braces
Aaron Boodman
2014/05/05 18:18:31
Done.
|
+ ui::PlatformEventSource::CreateDefault(); |
Ben Goodger (Google)
2014/05/02 22:58:02
don't you need to assign to event_source_ here?
Aaron Boodman
2014/05/05 18:18:31
whoopsie.
|
+ } |
ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this); |
delegate_->OnAcceleratedWidgetAvailable(window_); |