Fix incorrect position of Native Viewport contents on Windows

mojo/services/native_viewport/native_viewport_win.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/native_viewport/native_viewport.h"
 
 #include "ui/events/event.h"
 #include "ui/gfx/win/msg_util.h"
 #include "ui/gfx/win/window_impl.h"
 
@@ skipping 125 matching lines @@
     HBRUSH red_brush = CreateSolidBrush(RGB(255, 0, 0));
     HGDIOBJ old_object = SelectObject(dc, red_brush);
     Rectangle(dc, cr.left, cr.top, cr.right, cr.bottom);
     SelectObject(dc, old_object);
     DeleteObject(red_brush);
     EndPaint(hwnd(), &ps);
   }
   void OnWindowPosChanged(WINDOWPOS* window_pos) {
     if (!(window_pos->flags & SWP_NOSIZE) ||
         !(window_pos->flags & SWP_NOMOVE)) {
-      delegate_->OnBoundsChanged(gfx::Rect(window_pos->x, window_pos->y,
-                                           window_pos->cx, window_pos->cy));
+      RECT cr;
+      GetClientRect(hwnd(), &cr);
+      delegate_->OnBoundsChanged(
+          gfx::Rect(window_pos->x, window_pos->y,
+                    cr.right - cr.left, cr.bottom - cr.top));
     }
   }
 
   NativeViewportDelegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewportWin);
 };
 
 // static
 scoped_ptr<NativeViewport> NativeViewport::Create(
     shell::Context* context,
     NativeViewportDelegate* delegate) {
   return scoped_ptr<NativeViewport>(new NativeViewportWin(delegate)).Pass();
 }
 
 }  // namespace services
 }  // namespace mojo