Re-land:

chrome/browser/chromeos/frame/browser_frame_view_chromeos.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/frame/browser_frame_view_chromeos.h"
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
@@ skipping 31 matching lines @@
 bool BrowserFrameViewChromeos::HitTest(const gfx::Point& l) const {
   if (l.y() < kTopPad)
     return true;
   return OpaqueBrowserFrameView::HitTest(l);
 }
 
 views::View* BrowserFrameViewChromeos::GetEventHandlerForPoint(
     const gfx::Point& point) {
   if (point.y() < kTopPad) {
     gfx::Point nc_point(point.x(), kTopPad);
-    views::NonClientView* nc_view = frame()->GetWindow()->non_client_view();
+    views::NonClientView* nc_view = frame()->non_client_view();
     View::ConvertPointToView(this, nc_view, &nc_point);
     return nc_view->GetEventHandlerForPoint(nc_point);
   }
   return OpaqueBrowserFrameView::GetEventHandlerForPoint(point);
 }
 
 int BrowserFrameViewChromeos::GetHorizontalTabStripVerticalOffset(
     bool restored) const {
   return NonClientTopBorderHeight(restored, true) + kTopPad;
 }
 
 void BrowserFrameViewChromeos::ModifyMaximizedFramePainting(
     int* top_offset, SkBitmap** left_corner, SkBitmap** right_corner) {
   *top_offset = kThemeOffset;
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME))
     return;
   if (browser_view()->IsOffTheRecord()) {
     *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_LEFT);
     *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_INCOGNITO_RIGHT);
   } else {
     *left_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_LEFT);
     *right_corner = tp->GetBitmapNamed(IDR_THEME_FRAME_RIGHT);
   }
 }
 
 }  // namespace chromeos