Remove some pre-MD code from toolbar/tabstrip/frame.

chrome/browser/ui/views/toolbar/toolbar_view.cc

 // Copyright 2013 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/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 86 matching lines @@
 bool HasAshShell() {
 #if defined(USE_ASH)
   return ash::Shell::HasInstance();
 #else
   return false;
 #endif  // USE_ASH
 }
 #endif  // OS_CHROMEOS
 
 // Returns the y-position that will center an element of height
-// |child_height| inside an element of height |parent_height|. For
-// material design excess padding is placed below, for non-material
-// it is placed above.
+// |child_height| inside an element of height |parent_height|. Excess padding is
+// placed below.
 int CenteredChildY(int parent_height, int child_height) {
-  int roundoff_amount = ui::MaterialDesignController::IsModeMaterial() ? 0 : 1;
-  return (parent_height - child_height + roundoff_amount) / 2;
+  return (parent_height - child_height) / 2;

[Peter Kasting, 2016/09/22 23:27:25]

Nit: I'd just do this inline in the two callers, now that it's simple and clear
(arguably, clearer than the function call).  Here's the first caller:

  const int child_height =
      std::min(back_->GetPreferredSize().height(), height());
  const int child_y = (height() - child_height) / 2;

Or use Rect::ClampToCenteredSize() instead:

  gfx::Rect child_rect = GetLocalBounds();
  child_rect.ClampToCenteredSize(back_->GetPreferredSize());
  // Use child_rect.y()/.height() below, or declare temps

 }
 
 }  // namespace
 
 // static
 const char ToolbarView::kViewClassName[] = "ToolbarView";
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
@@ skipping 511 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, private:
 
 // views::ViewTargeterDelegate:
 bool ToolbarView::DoesIntersectRect(const views::View* target,
                                     const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
 
   // Fall through to the tab strip above us if none of |rect| intersects
   // with this view (intersection with the top shadow edge does not
   // count as intersection with this view).

[Peter Kasting, 2016/09/22 23:27:25]

Nit: Does this parenthetical have meaning anymore?  I take removing
content_shadow_height() to mean the "top shadow edge" is gone.

-  if (rect.bottom() < content_shadow_height())
+  if (rect.bottom() < 0)

[Peter Kasting, 2016/09/22 23:27:25]

Hmm, I suspect this was a slight bug?  Maybe they meant "<=" instead of "<".

[Evan Stade, 2016/09/23 00:31:08]

in fact I think we can ditch this entire function

     return false;
   // Otherwise let our superclass take care of it.
   return ViewTargeterDelegate::DoesIntersectRect(this, rect);

[Peter Kasting, 2016/09/22 23:27:25]

Nit: Simpler:

  // Fall through to the tab strip above us if none of |rect| intersects;
  // otherwise let our superclass take care of it.
  return (rect.bottom > 0) &&
         ViewTargeterDelegate::DoesIntersectRect(this, rect);

Note that this assumes that using "<" above was, indeed, a bug.

Though maybe with no "top shadow edge" we don't even need to override this
method at all.  Seems like the base ViewTargeterDelegate should now just do the
right thing?

[Evan Stade, 2016/09/23 00:31:08]

yea, I just came to the same conclusion

 }
 
 // AppMenuIconController::Delegate:
 void ToolbarView::UpdateSeverity(AppMenuIconController::IconType type,
                                  AppMenuIconPainter::Severity severity,
                                  bool animate) {
   // There's no app menu in tabless windows.
   if (!app_menu_button_)
     return;
 
@@ skipping 49 matching lines @@
         GetLayoutConstant(TOOLBAR_STANDARD_SPACING) +
         (browser_actions_width > 0 ? browser_actions_width : right_padding) +
         (app_menu_button_->*get_size)().width();
     size.Enlarge(content_width, 0);
   }
   return SizeForContentSize(size);
 }
 
 gfx::Size ToolbarView::SizeForContentSize(gfx::Size size) const {
   if (is_display_mode_normal()) {
-    // For Material Design the size of the toolbar is computed using the size
-    // of the location bar and constant padding values. For non-material the
-    // size is based on the provided assets.
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      int content_height = std::max(back_->GetPreferredSize().height(),
-                                    location_bar_->GetPreferredSize().height());
-      int padding = GetLayoutInsets(TOOLBAR).height();
-      size.SetToMax(gfx::Size(0, content_height + padding));
-    } else {
-      gfx::ImageSkia* normal_background =
-          GetThemeProvider()->GetImageSkiaNamed(IDR_CONTENT_TOP_CENTER);
-      size.SetToMax(
-          gfx::Size(0, normal_background->height() - content_shadow_height()));
-    }
+    // The size of the toolbar is computed using the size of the location bar
+    // and constant padding values.
+    int content_height = std::max(back_->GetPreferredSize().height(),
+                                  location_bar_->GetPreferredSize().height());
+    int padding = GetLayoutInsets(TOOLBAR).height();
+    size.SetToMax(gfx::Size(0, content_height + padding));
   }
   return size;
 }
 
 void ToolbarView::LoadImages() {
   const ui::ThemeProvider* tp = GetThemeProvider();
 
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    const SkColor normal_color =
-        tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
-    const SkColor disabled_color =
-        tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
+  const SkColor normal_color =
+      tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
+  const SkColor disabled_color =
+      tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE);
 
-    back_->SetImage(views::Button::STATE_NORMAL,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
-                                          normal_color));
-    back_->SetImage(views::Button::STATE_DISABLED,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
-                                          disabled_color));
-    forward_->SetImage(
-        views::Button::STATE_NORMAL,
-        gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
-                              normal_color));
-    forward_->SetImage(
-        views::Button::STATE_DISABLED,
-        gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
-                              disabled_color));
-    home_->SetImage(views::Button::STATE_NORMAL,
-                    gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,
-                                          normal_color));
-    app_menu_button_->UpdateIcon();
+  back_->SetImage(views::Button::STATE_NORMAL,
+                  gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
+                                        normal_color));
+  back_->SetImage(views::Button::STATE_DISABLED,
+                  gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_BACK,
+                                        disabled_color));
+  forward_->SetImage(
+      views::Button::STATE_NORMAL,
+      gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
+                            normal_color));
+  forward_->SetImage(
+      views::Button::STATE_DISABLED,
+      gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_FORWARD,
+                            disabled_color));
+  home_->SetImage(views::Button::STATE_NORMAL,
+                  gfx::CreateVectorIcon(gfx::VectorIconId::NAVIGATE_HOME,
+                                        normal_color));
+  app_menu_button_->UpdateIcon();
 
-    back_->set_ink_drop_base_color(normal_color);
-    forward_->set_ink_drop_base_color(normal_color);
-    home_->set_ink_drop_base_color(normal_color);
-    app_menu_button_->set_ink_drop_base_color(normal_color);
-  } else {
-    back_->SetImage(views::Button::STATE_NORMAL,
-                    *(tp->GetImageSkiaNamed(IDR_BACK)));
-    back_->SetImage(views::Button::STATE_DISABLED,
-                    *(tp->GetImageSkiaNamed(IDR_BACK_D)));
-    forward_->SetImage(views::Button::STATE_NORMAL,
-                       *(tp->GetImageSkiaNamed(IDR_FORWARD)));
-    forward_->SetImage(views::Button::STATE_DISABLED,
-                       *(tp->GetImageSkiaNamed(IDR_FORWARD_D)));
-    home_->SetImage(views::Button::STATE_NORMAL,
-                    *(tp->GetImageSkiaNamed(IDR_HOME)));
-  }
+  back_->set_ink_drop_base_color(normal_color);
+  forward_->set_ink_drop_base_color(normal_color);
+  home_->set_ink_drop_base_color(normal_color);
+  app_menu_button_->set_ink_drop_base_color(normal_color);
 
   reload_->LoadImages();
 }
 
 void ToolbarView::ShowCriticalNotification() {
 #if defined(OS_WIN)
   views::BubbleDialogDelegateView::CreateBubble(
       new CriticalNotificationBubbleView(app_menu_button_))->Show();
 #endif
 }
 
 void ToolbarView::ShowOutdatedInstallNotification(bool auto_update_enabled) {
   if (OutdatedUpgradeBubbleView::IsAvailable()) {
     OutdatedUpgradeBubbleView::ShowBubble(app_menu_button_, browser_,
                                           auto_update_enabled);
   }
 }
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
-
-int ToolbarView::content_shadow_height() const {
-#if defined(USE_ASH)
-  return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT_ASH);
-#else
-  return GetLayoutConstant(TOOLBAR_CONTENT_SHADOW_HEIGHT);
-#endif
-}