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

chrome/browser/ui/views/frame/immersive_mode_controller_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/immersive_mode_controller_ash.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/shared/immersive_revealed_lock.h"
 #include "ash/shell.h"
@@ skipping 16 matching lines @@
 #include "ui/aura/window.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace {
 
-// Revealing the TopContainerView looks better if the animation starts and ends
-// just a few pixels before the view goes offscreen, which reduces the visual
-// "pop" as the 3-pixel tall "light bar" style tab strip becomes visible.
-const int kAnimationOffsetY = 3;
-
 // Converts from ImmersiveModeController::AnimateReveal to
 // ash::ImmersiveFullscreenController::AnimateReveal.
 ash::ImmersiveFullscreenController::AnimateReveal
 ToImmersiveFullscreenControllerAnimateReveal(
     ImmersiveModeController::AnimateReveal animate_reveal) {
   switch (animate_reveal) {
     case ImmersiveModeController::ANIMATE_REVEAL_YES:
       return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_YES;
     case ImmersiveModeController::ANIMATE_REVEAL_NO:
       return ash::ImmersiveFullscreenController::ANIMATE_REVEAL_NO;
@@ skipping 34 matching lines @@
 };
 
 }  // namespace
 
 ImmersiveModeControllerAsh::ImmersiveModeControllerAsh()
     : ImmersiveModeController(Type::ASH),
       controller_(new ash::ImmersiveFullscreenController),
       browser_view_(nullptr),
       native_window_(nullptr),
       observers_enabled_(false),
-      use_tab_indicators_(false),
       visible_fraction_(1) {}
 
 ImmersiveModeControllerAsh::~ImmersiveModeControllerAsh() {
   EnableWindowObservers(false);
 }
 
 void ImmersiveModeControllerAsh::Init(BrowserView* browser_view) {
   browser_view_ = browser_view;
   native_window_ = browser_view_->GetNativeWindow();
   controller_->Init(this, browser_view_->frame(),
       browser_view_->top_container());
 }
 
 void ImmersiveModeControllerAsh::SetEnabled(bool enabled) {
   if (controller_->IsEnabled() == enabled)
     return;
 
   EnableWindowObservers(enabled);
 
   controller_->SetEnabled(browser_view_->browser()->is_app() ?
           ash::ImmersiveFullscreenController::WINDOW_TYPE_HOSTED_APP :
           ash::ImmersiveFullscreenController::WINDOW_TYPE_BROWSER
       , enabled);
 }
 
 bool ImmersiveModeControllerAsh::IsEnabled() const {
   return controller_->IsEnabled();
 }
 
-bool ImmersiveModeControllerAsh::ShouldHideTabIndicators() const {
-  return !use_tab_indicators_;
-}
-
 bool ImmersiveModeControllerAsh::ShouldHideTopViews() const {
   return controller_->IsEnabled() && !controller_->IsRevealed();
 }
 
 bool ImmersiveModeControllerAsh::IsRevealed() const {
   return controller_->IsRevealed();
 }
 
 int ImmersiveModeControllerAsh::GetTopContainerVerticalOffset(
     const gfx::Size& top_container_size) const {
   if (!IsEnabled())
     return 0;
 
-  // The TopContainerView is flush with the top of |browser_view_| when the
-  // top-of-window views are fully closed so that when the tab indicators are
-  // used, the "light bar" style tab strip is flush with the top of
-  // |browser_view_|.
-  if (!IsRevealed())
-    return 0;
-
-  int height = top_container_size.height() - kAnimationOffsetY;
-  return static_cast<int>(height * (visible_fraction_ - 1));
+  return static_cast<int>(top_container_size.height() *
+                          (visible_fraction_ - 1));
 }
 
 ImmersiveRevealedLock* ImmersiveModeControllerAsh::GetRevealedLock(
     AnimateReveal animate_reveal) {
   return new ImmersiveRevealedLockAsh(controller_->GetRevealedLock(
       ToImmersiveFullscreenControllerAnimateReveal(animate_reveal)));
 }
 
 void ImmersiveModeControllerAsh::OnFindBarVisibleBoundsChanged(
     const gfx::Rect& new_visible_bounds_in_screen) {
@@ skipping 29 matching lines @@
 
 void ImmersiveModeControllerAsh::LayoutBrowserRootView() {
   views::Widget* widget = browser_view_->frame();
   // Update the window caption buttons.
   widget->non_client_view()->frame_view()->ResetWindowControls();
   widget->non_client_view()->frame_view()->InvalidateLayout();
   browser_view_->InvalidateLayout();
   widget->GetRootView()->Layout();
 }
 
-// TODO(yiyix|tdanderson): Once Chrome OS material design is enabled by default,
-// remove all code related to immersive mode hints (here, in TabStrip and
-// BrowserNonClientFrameViewAsh::OnPaint()). See crbug.com/614453.
-bool ImmersiveModeControllerAsh::UpdateTabIndicators() {
-  if (ash::MaterialDesignController::IsImmersiveModeMaterial())
-    return false;
-
-  bool has_tabstrip = browser_view_->IsBrowserTypeNormal();
-  if (!IsEnabled() || !has_tabstrip) {
-    use_tab_indicators_ = false;
-  } else {
-    bool in_tab_fullscreen = browser_view_->browser()
-                                 ->exclusive_access_manager()
-                                 ->fullscreen_controller()
-                                 ->IsWindowFullscreenForTabOrPending();
-    use_tab_indicators_ = !in_tab_fullscreen;
-  }
-
-  bool show_tab_indicators = use_tab_indicators_ && !IsRevealed();
-  if (show_tab_indicators != browser_view_->tabstrip()->IsImmersiveStyle()) {
-    browser_view_->tabstrip()->SetImmersiveStyle(show_tab_indicators);
-    return true;
-  }
-  return false;
-}
-
 void ImmersiveModeControllerAsh::CreateMashRevealWidget() {
   if (!chrome::IsRunningInMash())
     return;
 
   DCHECK(!mash_reveal_widget_);
   mash_reveal_widget_ = base::MakeUnique<views::Widget>();
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_POPUP);
   init_params.mus_properties
       [ui::mojom::WindowManager::kRenderParentTitleArea_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
@@ skipping 18 matching lines @@
 void ImmersiveModeControllerAsh::DestroyMashRevealWidget() {
   mash_reveal_widget_.reset();
 }
 
 void ImmersiveModeControllerAsh::OnImmersiveRevealStarted() {
   DestroyMashRevealWidget();
 
   visible_fraction_ = 0;
   browser_view_->top_container()->SetPaintToLayer(true);
   browser_view_->top_container()->layer()->SetFillsBoundsOpaquely(false);
-  UpdateTabIndicators();
   LayoutBrowserRootView();
   CreateMashRevealWidget();
   for (Observer& observer : observers_)
     observer.OnImmersiveRevealStarted();
 }
 
 void ImmersiveModeControllerAsh::OnImmersiveRevealEnded() {
   DestroyMashRevealWidget();
   visible_fraction_ = 0;
   browser_view_->top_container()->SetPaintToLayer(false);
-  UpdateTabIndicators();
   LayoutBrowserRootView();
 }
 
 void ImmersiveModeControllerAsh::OnImmersiveFullscreenExited() {
   DestroyMashRevealWidget();
   browser_view_->top_container()->SetPaintToLayer(false);
-  UpdateTabIndicators();
   LayoutBrowserRootView();
 }
 
 void ImmersiveModeControllerAsh::SetVisibleFraction(double visible_fraction) {
   if (visible_fraction_ != visible_fraction) {
     visible_fraction_ = visible_fraction;
     browser_view_->Layout();
 
     if (mash_reveal_widget_) {
       gfx::Rect bounds = mash_reveal_widget_->GetNativeWindow()->bounds();
@@ skipping 42 matching lines @@
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   if (!controller_->IsEnabled())
     return;
 
   if (chrome::IsRunningInMash()) {
     // TODO: http://crbug.com/640384.
     NOTIMPLEMENTED();
     return;
   }
 
-  bool tab_indicator_visibility_changed = UpdateTabIndicators();
-
-  // Auto hide the shelf in immersive browser fullscreen. When auto hidden and
-  // Material Design is not enabled, the shelf displays a 3px 'light bar' when
-  // it is closed. When in immersive browser fullscreen and tab fullscreen, hide
-  // the shelf completely and prevent it from being revealed.
+  // Auto hide the shelf in immersive browser fullscreen.
   bool in_tab_fullscreen = content::Source<FullscreenController>(source)->
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)
       ->set_hide_shelf_when_fullscreen(in_tab_fullscreen);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
-
-  if (tab_indicator_visibility_changed)
-    LayoutBrowserRootView();
 }