Re-land:

views/window/native_frame_view.cc

Index: views/window/native_frame_view.cc
===================================================================
--- views/window/native_frame_view.cc	(revision 85284)
+++ views/window/native_frame_view.cc	(working copy)
@@ -4,14 +4,16 @@
 
 #include "views/window/native_frame_view.h"
 
-#include "views/window/window_win.h"
+#include "views/widget/widget_win.h"
+#include "views/window/native_window.h"
+#include "views/window/window.h"
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeFrameView, public:
 
-NativeFrameView::NativeFrameView(WindowWin* frame)
+NativeFrameView::NativeFrameView(Window* frame)
     : NonClientFrameView(),
       frame_(frame) {
 }
@@ -29,8 +31,10 @@
 gfx::Rect NativeFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   RECT rect = client_bounds.ToRECT();
-  AdjustWindowRectEx(&rect, frame_->window_style(), FALSE,
-                     frame_->window_ex_style());
+  WidgetWin* widget_win =
+      static_cast<WidgetWin*>(frame_->native_window()->AsNativeWidget());
+  AdjustWindowRectEx(&rect, widget_win->window_style(), FALSE,
+                     widget_win->window_ex_style());
   return gfx::Rect(rect);
 }