| 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 e2310cbbd785e1b27c3c28a6c17d52f9ffd624f7..0f5004437796cc051c60d2e59647c64fef94e671 100644
|
| --- a/mojo/services/native_viewport/native_viewport_x11.cc
|
| +++ b/mojo/services/native_viewport/native_viewport_x11.cc
|
| @@ -20,6 +20,23 @@ class NativeViewportX11 : public NativeViewport,
|
| NativeViewportX11(NativeViewportDelegate* delegate)
|
| : delegate_(delegate),
|
| bounds_(10, 10, 500, 500) {
|
| + }
|
| +
|
| + virtual ~NativeViewportX11() {
|
| + base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
|
| + base::MessagePumpX11::Current()->RemoveDispatcherForWindow(window_);
|
| +
|
| + XDestroyWindow(gfx::GetXDisplay(), window_);
|
| + }
|
| +
|
| + private:
|
| + // Overridden from NativeViewport:
|
| +
|
| + virtual gfx::Size GetSize() OVERRIDE {
|
| + return bounds_.size();
|
| + }
|
| +
|
| + virtual void Open() OVERRIDE {
|
| XDisplay* display = gfx::GetXDisplay();
|
| XSetWindowAttributes swa;
|
| memset(&swa, 0, sizeof(swa));
|
| @@ -43,18 +60,6 @@ class NativeViewportX11 : public NativeViewport,
|
| delegate_->OnAcceleratedWidgetAvailable(window_);
|
| }
|
|
|
| - virtual ~NativeViewportX11() {
|
| - base::MessagePumpX11::Current()->RemoveDispatcherForRootWindow(this);
|
| - base::MessagePumpX11::Current()->RemoveDispatcherForWindow(window_);
|
| -
|
| - XDestroyWindow(gfx::GetXDisplay(), window_);
|
| - }
|
| -
|
| - private:
|
| - // Overridden from NativeViewport:
|
| - virtual gfx::Size GetSize() OVERRIDE {
|
| - return bounds_.size();
|
| - }
|
| virtual void Close() OVERRIDE {
|
| // TODO(beng): perform this in response to XWindow destruction.
|
| delegate_->OnDestroyed();
|
|
|