Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1330)

Unified Diff: mojo/services/native_viewport/native_viewport_win.cc

Issue 65883002: mojo_shell crashes on Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/native_viewport/native_viewport_win.cc
diff --git a/mojo/services/native_viewport/native_viewport_win.cc b/mojo/services/native_viewport/native_viewport_win.cc
index 9b0b668c2a1645d8da7eacf5ffe2e6db779b33b2..61d0e28f075467f5d7ef92a9a8e24842caf577ec 100644
--- a/mojo/services/native_viewport/native_viewport_win.cc
+++ b/mojo/services/native_viewport/native_viewport_win.cc
@@ -15,9 +15,6 @@ class NativeViewportWin : public gfx::WindowImpl,
public:
explicit NativeViewportWin(NativeViewportDelegate* delegate)
: delegate_(delegate) {
- Init(NULL, gfx::Rect(10, 10, 500, 500));
- ShowWindow(hwnd(), SW_SHOWNORMAL);
- SetWindowText(hwnd(), L"native_viewport::NativeViewportWin!");
}
virtual ~NativeViewportWin() {
if (IsWindow(hwnd()))
@@ -31,6 +28,13 @@ class NativeViewportWin : public gfx::WindowImpl,
GetClientRect(hwnd(), &cr);
return gfx::Size(cr.right - cr.left, cr.bottom - cr.top);
}
+
+ virtual void Open() OVERRIDE {
+ Init(NULL, gfx::Rect(10, 10, 500, 500));
+ ShowWindow(hwnd(), SW_SHOWNORMAL);
+ SetWindowText(hwnd(), L"native_viewport::NativeViewportWin!");
+ }
+
virtual void Close() OVERRIDE {
DestroyWindow(hwnd());
}

Powered by Google App Engine
This is Rietveld 408576698