Remove pre-MD code from browser/ui/views/tabs/tab.cc

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 184 matching lines @@
   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())

[tdanderson, 2016/09/23 21:57:09]

MD immersive mode was turned on in early 55 which hasn't even hit beta channel,
so please leave the old immersive mode code in place until MD immersive makes it
into stable. We will clean it up at that point as per the TODO above.

[Evan Stade, 2016/09/26 16:40:39]

ah ok, my bad.

-    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_.reset(new views::Widget);
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_POPUP);
@@ skipping 125 matching lines @@
       IsWindowFullscreenForTabOrPending();
   ash::wm::GetWindowState(native_window_)
       ->set_shelf_mode_in_fullscreen(
           in_tab_fullscreen ? ash::wm::WindowState::SHELF_HIDDEN
                             : ash::wm::WindowState::SHELF_AUTO_HIDE_VISIBLE);
   ash::Shell::GetInstance()->UpdateShelfVisibility();
 
   if (tab_indicator_visibility_changed)
     LayoutBrowserRootView();
 }