Enable immersive fullscreen for hosted apps part 2

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 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 "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 186 matching lines @@
   if (bookmark_bar_ &&
       bookmark_bar_->visible() &&
       browser()->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
     bookmark_bar_size = bookmark_bar_->GetMinimumSize();
     bookmark_bar_size.Enlarge(0, -bookmark_bar_->GetToolbarOverlap());
   }
   // TODO: Adjust the minimum height for the find bar.
 
   gfx::Size contents_size(contents_split_->GetMinimumSize());
 
-  int min_height = tabstrip_size.height() + toolbar_size.height() +
+  int min_height = delegate_->GetTopInsetInBrowserView() +
+      tabstrip_size.height() + toolbar_size.height() +
       bookmark_bar_size.height() + contents_size.height();
   int widths[] = {
         tabstrip_size.width(),
         toolbar_size.width(),
         bookmark_bar_size.width(),
         contents_size.width() };
   int min_width = *std::max_element(&widths[0], &widths[arraysize(widths)]);
   return gfx::Size(min_width, min_height);
 }
 
@@ skipping 307 matching lines @@
   gfx::Rect contents_split_bounds(vertical_layout_rect_.x(),
                                   top,
                                   vertical_layout_rect_.width(),
                                   std::max(0, bottom - top));
   contents_split_->SetBoundsRect(contents_split_bounds);
 }
 
 void BrowserViewLayout::UpdateTopContainerBounds() {
   gfx::Rect top_container_bounds(top_container_->GetPreferredSize());
 
-  // If the immersive mode controller is animating the top-of-window views,
-  // part of the top container may be offscreen.
+  // If the immersive mode controller is animating the top container, it may be
+  // partly offscreen. The top container is positioned relative to the top of
+  // the client view instead of relative to GetTopInsetInBrowserView() because
+  // the top container paints parts of the frame (title, window controls) during
+  // an immersive reveal.
   top_container_bounds.set_y(
       immersive_mode_controller_->GetTopContainerVerticalOffset(
           top_container_bounds.size()));
   top_container_->SetBoundsRect(top_container_bounds);
 }
 
 int BrowserViewLayout::GetContentsOffsetForBookmarkBar() {
   // If the bookmark bar is hidden or attached to the omnibox the web contents
   // will appear directly underneath it and does not need an offset.
   if (!bookmark_bar_ ||
@@ skipping 26 matching lines @@
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // 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);
 }