Re-land:

chrome/browser/ui/views/frame/browser_view_layout.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/ui/views/frame/browser_view_layout.h"
 
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 538 matching lines @@
   } else {
     contents_bounds = sidebar_split_bounds;
   }
 
   // Layout resize corner, sidebar mini tabs and calculate reserved contents
   // rects here as all contents view bounds are already determined, but not yet
   // set at this point, so contents will be laid out once at most.
   // TODO(alekseys): layout sidebar minitabs and adjust reserved rect
   // accordingly.
   gfx::Rect browser_reserved_rect;
-  if (!browser_view_->frame_->GetWindow()->IsMaximized() &&
-      !browser_view_->frame_->GetWindow()->IsFullscreen()) {
+  if (!browser_view_->frame_->IsMaximized() &&
+      !browser_view_->frame_->IsFullscreen()) {
     gfx::Size resize_corner_size = browser_view_->GetResizeCornerSize();
     if (!resize_corner_size.IsEmpty()) {
       gfx::Rect bounds = browser_view_->GetContentsBounds();
       gfx::Point resize_corner_origin(
           bounds.right() - resize_corner_size.width(),
           bounds.bottom() - resize_corner_size.height());
       browser_reserved_rect =
           gfx::Rect(resize_corner_origin, resize_corner_size);
     }
   }
@@ skipping 57 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container_->GetPreferredSize().height() != 0);
 }