[Merge to M57] cros-md: Remove the non-MD immersive mode code paths

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_non_client_frame_view_ash.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/default_header_painter.h"
 #include "ash/common/frame/frame_border_hit_test.h"
 #include "ash/common/frame/header_painter_util.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 94 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameView:
 
 gfx::Rect BrowserNonClientFrameViewAsh::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
 
-  // When the tab strip is painted in the immersive fullscreen light bar style,
-  // the caption buttons and the avatar button are not visible. However, their
-  // bounds are still used to compute the tab strip bounds so that the tabs have
-  // the same horizontal position when the tab strip is painted in the immersive
-  // light bar style as when the top-of-window views are revealed.
   const int left_inset = GetTabStripLeftInset();
   return gfx::Rect(left_inset, GetTopInset(false),
                    std::max(0, width() - left_inset - GetTabStripRightInset()),
                    tabstrip->GetPreferredSize().height());
 }
 
 int BrowserNonClientFrameViewAsh::GetTopInset(bool restored) const {
-  if (!ShouldPaint() || UseImmersiveLightbarHeaderStyle())
+  if (!ShouldPaint()) {
+    // When immersive fullscreen unrevealed, tabstrip is offscreen with normal
+    // tapstrip bounds, the top inset should reach this topmost edge.
+    const ImmersiveModeController* const immersive_controller =
+        browser_view()->immersive_mode_controller();
+    if (immersive_controller->IsEnabled() &&
+        !immersive_controller->IsRevealed()) {
+      return (-1) * browser_view()->GetTabStripHeight();
+    }
     return 0;
+  }
 
   if (!browser_view()->IsTabStripVisible()) {
     return (UsePackagedAppHeaderStyle())
         ? header_painter_->GetHeaderHeight()
         : caption_button_container_->bounds().bottom();
   }
 
   const int header_height = restored
       ? GetAshLayoutSize(
             AshLayoutSize::BROWSER_RESTORED_CAPTION_BUTTON).height()
@@ skipping 45 matching lines @@
 
   return hit_test;
 }
 
 void BrowserNonClientFrameViewAsh::GetWindowMask(const gfx::Size& size,
                                                  gfx::Path* window_mask) {
   // Aura does not use window masks.
 }
 
 void BrowserNonClientFrameViewAsh::ResetWindowControls() {
-  // Hide the caption buttons in immersive fullscreen when the tab light bar
-  // is visible because it's confusing when the user hovers or clicks in the
-  // top-right of the screen and hits one.
-  // TODO(yiyix): Update |caption_button_container_|'s visibility calculation
-  // when Chrome OS MD is enabled by default.
-  caption_button_container_->SetVisible(!UseImmersiveLightbarHeaderStyle());
+  caption_button_container_->SetVisible(true);
   caption_button_container_->ResetWindowControls();
 }
 
 void BrowserNonClientFrameViewAsh::UpdateWindowIcon() {
   if (window_icon_)
     window_icon_->SchedulePaint();
 }
 
 void BrowserNonClientFrameViewAsh::UpdateWindowTitle() {
   if (!frame()->IsFullscreen())
     header_painter_->SchedulePaintForTitle();
 }
 
 void BrowserNonClientFrameViewAsh::SizeConstraintsChanged() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::View:
 
 void BrowserNonClientFrameViewAsh::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldPaint())
     return;
 
-  if (UseImmersiveLightbarHeaderStyle()) {
-    // The light bar header is not themed because theming it does not look good.
-    canvas->FillRect(
-        gfx::Rect(width(), header_painter_->GetHeaderHeightForPainting()),
-        SK_ColorBLACK);
-    return;
-  }
-
   const bool should_paint_as_active = ShouldPaintAsActive();
   caption_button_container_->SetPaintAsActive(should_paint_as_active);
 
   const ash::HeaderPainter::Mode header_mode = should_paint_as_active ?
       ash::HeaderPainter::MODE_ACTIVE : ash::HeaderPainter::MODE_INACTIVE;
   header_painter_->PaintHeader(canvas, header_mode);
 
   if (browser_view()->IsToolbarVisible() &&
       !browser_view()->toolbar()->GetPreferredSize().IsEmpty() &&
       browser_view()->IsTabStripVisible()) {
     PaintToolbarBackground(canvas);
   }
 }
 
 void BrowserNonClientFrameViewAsh::Layout() {
   // The header must be laid out before computing |painted_height| because the
   // computation of |painted_height| for app and popup windows depends on the
   // position of the window controls.
   header_painter_->LayoutHeader();
 
   int painted_height = GetTopInset(false);
-  if (browser_view()->IsTabStripVisible()) {
-    const ImmersiveModeController* const immersive_controller =
-        browser_view()->immersive_mode_controller();
-    if (!immersive_controller->IsEnabled() ||
-        immersive_controller->IsRevealed() ||
-        !ash::MaterialDesignController::IsImmersiveModeMaterial()) {
-      painted_height += browser_view()->tabstrip()->GetPreferredSize().height();
-    }
-  }
+  if (browser_view()->IsTabStripVisible())
+    painted_height += browser_view()->tabstrip()->GetPreferredSize().height();
 
   header_painter_->SetHeaderHeightForPainting(painted_height);
 
   if (profile_indicator_icon())
     LayoutProfileIndicatorIcon();
   BrowserNonClientFrameView::Layout();
   frame()->GetNativeWindow()->SetProperty(
       aura::client::kTopViewInset,
       browser_view()->IsTabStripVisible() ? 0 : GetTopInset(true));
 }
@@ skipping 99 matching lines @@
           ? (kAvatarIconPadding + GetIncognitoAvatarIcon().width())
           : 0;
   return avatar_right + kAvatarIconPadding;
 }
 
 int BrowserNonClientFrameViewAsh::GetTabStripRightInset() const {
   return kTabstripRightSpacing +
       caption_button_container_->GetPreferredSize().width();
 }
 
-bool BrowserNonClientFrameViewAsh::UseImmersiveLightbarHeaderStyle() const {
-  if (ash::MaterialDesignController::IsImmersiveModeMaterial())
-    return false;
-
-  const ImmersiveModeController* const immersive_controller =
-      browser_view()->immersive_mode_controller();
-  return immersive_controller->IsEnabled() &&
-         !immersive_controller->IsRevealed() &&
-         browser_view()->IsTabStripVisible();
-}
-
 bool BrowserNonClientFrameViewAsh::UsePackagedAppHeaderStyle() const {
   // Use for non tabbed trusted source windows, e.g. Settings, as well as apps.
   const Browser* const browser = browser_view()->browser();
   return (!browser->is_type_tabbed() && browser->is_trusted_source()) ||
          browser->is_app();
 }
 
 void BrowserNonClientFrameViewAsh::LayoutProfileIndicatorIcon() {
   DCHECK(profile_indicator_icon());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
 
   const gfx::ImageSkia incognito_icon = GetIncognitoAvatarIcon();
   const int avatar_bottom = GetTopInset(false) +
                             browser_view()->GetTabStripHeight() -
                             kAvatarIconPadding;
   int avatar_y = avatar_bottom - incognito_icon.height();
 
-  // Hide the incognito icon in immersive fullscreen when the tab light bar is
-  // visible because the header is too short for the icognito icon to be
-  // recognizable.
-  const bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
-  const int avatar_height = avatar_visible ? (avatar_bottom - avatar_y) : 0;
+  const int avatar_height = avatar_bottom - avatar_y;
   profile_indicator_icon()->SetBounds(kAvatarIconPadding, avatar_y,
                                       incognito_icon.width(), avatar_height);
-  profile_indicator_icon()->SetVisible(avatar_visible);
+  profile_indicator_icon()->SetVisible(true);
 }
 
 bool BrowserNonClientFrameViewAsh::ShouldPaint() const {
   if (!frame()->IsFullscreen())
     return true;
 
-  // We need to paint when in immersive fullscreen and either:
-  // - The top-of-window views are revealed.
-  // - The lightbar style tabstrip is visible.
+  // We need to paint when the top-of-window views are revealed in immersive
+  // fullscreen.
   ImmersiveModeController* immersive_mode_controller =
       browser_view()->immersive_mode_controller();
   return immersive_mode_controller->IsEnabled() &&
-      (immersive_mode_controller->IsRevealed() ||
-       UseImmersiveLightbarHeaderStyle());
+         immersive_mode_controller->IsRevealed();
 }
 
 void BrowserNonClientFrameViewAsh::PaintToolbarBackground(gfx::Canvas* canvas) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
   const ui::ThemeProvider* tp = GetThemeProvider();
@@ skipping 20 matching lines @@
                                  toolbar_bounds.width(), 0);
   BrowserView::Paint1pxHorizontalLine(canvas, GetToolbarTopSeparatorColor(),
                                       separator_rect, true);
 
   // Toolbar/content separator.
   toolbar_bounds.Inset(kClientEdgeThickness, 0);
   BrowserView::Paint1pxHorizontalLine(
       canvas, tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
       toolbar_bounds, true);
 }