cros-md: Remove the non-MD immersive mode code paths

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/macros.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"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
 #include "chrome/browser/ui/views/frame/contents_layout_manager.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "ui/base/hit_test.h"
-#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/client_view.h"
 
 using views::View;
 using web_modal::WebContentsModalDialogHost;
 using web_modal::ModalDialogHostObserver;
@@ skipping 445 matching lines @@
   int height = 0;
   for (int i = 0; i < top_container_->child_count(); ++i) {
     views::View* child = top_container_->child_at(i);
     if (!child->visible())
       continue;
     int child_bottom = child->bounds().bottom();
     if (child_bottom > height)
       height = child_bottom;
   }
 
+  // For immersive fullscreen, tabstrip is considered visible. During the
+  // |height| update, the non-zero |height| should return to zero instead.
+  if (immersive_mode_controller_->IsEnabled() &&

[sky, 2017/02/13 16:57:19]

How did pre-md immersive inject a height of 3?

[Qiang(Joe) Xu, 2017/02/13 21:21:08]

It is because:
https://cs.chromium.org/chromium/src/chrome/browser/ui/views/frame/browser_no...,
the call of GetPreferredSize(),
which is
https://cs.chromium.org/chromium/src/chrome/browser/ui/views/tabs/tab_strip.c...

Thanks for asking me. Before, when I am doing logging, I blamed the height
change from 3 to 29 on tabstrip visible. But actually the root cause is here,
immersive_style_ is always false now (we should remove it actually), which makes
the preferred size using Tab::GetMinimumInactiveSize().height(). We should now
make it switch between 0 and Tab::GetMinimumInactiveSize().height().

Let me think how to do it gracefully. Should we remove |immersive_style_| in
this CL?

+      !immersive_mode_controller_->IsRevealed()) {
+    height = 0;
+  }
+
   // Ensure that the top container view reaches the topmost view in the
   // ClientView because the bounds of the top container view are used in
   // layout and we assume that this is the case.
   height = std::max(height, delegate_->GetTopInsetInBrowserView(false));
 
   gfx::Rect top_container_bounds(vertical_layout_rect_.width(), height);
 
   // If the immersive mode controller is animating the top container, it may be
   // partly offscreen.
   top_container_bounds.set_y(
@@ skipping 31 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);
 }