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

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

 // Copyright 2015 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_mus.h"
 
 #include <algorithm>
 
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 116 matching lines @@
   DCHECK(!tab_strip_);
   tab_strip_ = browser_view()->tabstrip();
   tab_strip_->AddObserver(this);
 }
 
 gfx::Rect BrowserNonClientFrameViewMus::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.
   int left_inset = GetTabStripLeftInset();
   int right_inset = GetTabStripRightInset();
   return gfx::Rect(left_inset, GetTopInset(false),
                    std::max(0, width() - left_inset - right_inset),
                    tabstrip->GetPreferredSize().height());
 }
 
 int BrowserNonClientFrameViewMus::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 ((frame()->IsMaximized() || frame()->IsFullscreen()) && !restored)
                ? kTabstripTopSpacingShort
                : kTabstripTopSpacingTall;
   }
 
   int caption_buttons_bottom = frame_values().normal_insets.top();
 
   // The toolbar partially overlaps the caption buttons.
@@ skipping 80 matching lines @@
 
 void BrowserNonClientFrameViewMus::SizeConstraintsChanged() {}
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::View:
 
 void BrowserNonClientFrameViewMus::OnPaint(gfx::Canvas* canvas) {
   if (!ShouldPaint())
     return;
 
-  // TODO(sky): get immersive mode working.
-
-  if (UseImmersiveLightbarHeaderStyle()) {
-    PaintImmersiveLightbarStyleHeader(canvas);
-    return;
-  }
-
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
   else if (!UsePackagedAppHeaderStyle())
     PaintContentEdge(canvas);
 }
 
 void BrowserNonClientFrameViewMus::Layout() {
   if (profile_indicator_icon())
     LayoutIncognitoButton();
 
@@ skipping 108 matching lines @@
 #if defined(FRAME_AVATAR_BUTTON)
   if (profile_switcher_.view()) {
     right_inset += kAvatarButtonOffset +
                    profile_switcher_.view()->GetPreferredSize().width();
   }
 #endif
 
   return right_inset;
 }
 
-bool BrowserNonClientFrameViewMus::UseImmersiveLightbarHeaderStyle() const {
-  ImmersiveModeController* immersive_controller =
-      browser_view()->immersive_mode_controller();
-  return immersive_controller->IsEnabled() &&
-         !immersive_controller->IsRevealed() &&
-         browser_view()->IsTabStripVisible();
-}
-
 bool BrowserNonClientFrameViewMus::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 BrowserNonClientFrameViewMus::LayoutIncognitoButton() {
   DCHECK(profile_indicator_icon());
 #if !defined(OS_CHROMEOS)
   // ChromeOS shows avatar on V1 app.
   DCHECK(browser_view()->IsTabStripVisible());
 #endif
   gfx::ImageSkia incognito_icon = GetIncognitoAvatarIcon();
   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.
-  bool avatar_visible = !UseImmersiveLightbarHeaderStyle();
-  int avatar_height = avatar_visible ? incognito_icon.height() : 0;
+  int avatar_height = incognito_icon.height();
 
   gfx::Rect avatar_bounds(kAvatarIconPadding, avatar_y, incognito_icon.width(),
                           avatar_height);
   profile_indicator_icon()->SetBoundsRect(avatar_bounds);
-  profile_indicator_icon()->SetVisible(avatar_visible);
+  profile_indicator_icon()->SetVisible(true);
 }
 
 void BrowserNonClientFrameViewMus::LayoutProfileSwitcher() {
 #if defined(FRAME_AVATAR_BUTTON)
   gfx::Size button_size = profile_switcher_.view()->GetPreferredSize();
   int button_x = width() - GetTabStripRightInset() + kAvatarButtonOffset;
   profile_switcher_.view()->SetBounds(button_x, 0, button_size.width(),
                                       button_size.height());
 #endif
 }
 
 bool BrowserNonClientFrameViewMus::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 BrowserNonClientFrameViewMus::PaintImmersiveLightbarStyleHeader(
-    gfx::Canvas* canvas) {}
-
 void BrowserNonClientFrameViewMus::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();
 
   // Background.
@@ skipping 28 matching lines @@
 }
 
 void BrowserNonClientFrameViewMus::PaintContentEdge(gfx::Canvas* canvas) {
   DCHECK(!UsePackagedAppHeaderStyle());
   const int bottom = frame_values().normal_insets.bottom();
   canvas->FillRect(
       gfx::Rect(0, bottom, width(), kClientEdgeThickness),
       GetThemeProvider()->GetColor(
           ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
 }