Remove some more !IsModeMaterial code.

chrome/browser/ui/views/frame/browser_view.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_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 183 matching lines @@
 
 // The name of a key to store on the window handle so that other code can
 // locate this object using just the handle.
 const char* const kBrowserViewKey = "__BROWSER_VIEW__";
 
 // The number of milliseconds between loading animation frames.
 const int kLoadingAnimationFrameTimeMs = 30;
 
 // Paints the horizontal border separating the Bookmarks Bar from the Toolbar
 // or page content according to |at_top| with |color|.
-void PaintHorizontalBorder(gfx::Canvas* canvas,
-                           BookmarkBarView* view,
-                           bool at_top,
-                           SkColor color) {
-  int thickness = views::NonClientFrameView::kClientEdgeThickness;
-  int y = at_top ? 0 : (view->height() - thickness);
-  canvas->FillRect(gfx::Rect(0, y, view->width(), thickness), color);
-}
-
 void PaintDetachedBookmarkBar(gfx::Canvas* canvas,
                               BookmarkBarView* view) {
   // Paint background for detached state; if animating, this is fade in/out.
   const ui::ThemeProvider* tp = view->GetThemeProvider();
   gfx::Rect fill_rect = view->GetLocalBounds();
-  // In MD, we have to not color the top 1dp, because that should be painted by
-  // the toolbar. We will, however, paint the 1px separator at the bottom of the
+  // We have to not color the top 1dp, because that should be painted by the
+  // toolbar. We will, however, paint the 1px separator at the bottom of the
   // first dp. See crbug.com/610359
-  if (ui::MaterialDesignController::IsModeMaterial())
-    fill_rect.Inset(0, 1, 0, 0);
+  fill_rect.Inset(0, 1, 0, 0);
 
   // In detached mode, the bar is meant to overlap with |contents_container_|.
   // The detached background color may be partially transparent, but the layer
   // for |view| must be painted opaquely to avoid subpixel anti-aliasing
   // artifacts, so we recreate the contents container base color here.
   canvas->FillRect(fill_rect,
                    tp->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND));
   canvas->FillRect(
       fill_rect,
       tp->GetColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND));
 
   // Draw the separators above and below bookmark bar;
   // if animating, these are fading in/out.
   SkColor separator_color =
       tp->GetColor(ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR);
 
-  // In material mode the toolbar bottom stroke serves as our top stroke.
-  if (!ui::MaterialDesignController::IsModeMaterial())
-    PaintHorizontalBorder(canvas, view, true, separator_color);
-
   // For the bottom separator, increase the luminance. Either double it or halve
   // the distance to 1.0, whichever is less of a difference.
   color_utils::HSL hsl;
   color_utils::SkColorToHSL(separator_color, &hsl);
   hsl.l = std::min((hsl.l + 1) / 2, hsl.l * 2);
   BrowserView::Paint1pxHorizontalLine(
       canvas, color_utils::HSLToSkColor(hsl, SK_AlphaOPAQUE),
       view->GetLocalBounds(), true);
 }
 
 // Paints the background (including the theme image behind content area) for
 // the Bookmarks Bar when it is attached to the Toolbar into |bounds|.
 // |background_origin| is the origin to use for painting the theme image.
 void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
                                  const ui::ThemeProvider* theme_provider,
                                  const gfx::Rect& bounds,
                                  const gfx::Point& background_origin) {
   canvas->DrawColor(theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR));
 
   // Always tile the background image in pre-MD. In MD, only tile if there's a
   // non-default image.

[Peter Kasting, 2016/10/21 21:07:50]

Nit: Update comment

[Evan Stade, 2016/10/21 22:11:12]

Done.

-  // TODO(estade): remove IDR_THEME_TOOLBAR when MD is default.

[Peter Kasting, 2016/10/21 21:07:50]

Not sure what this meant

[Evan Stade, 2016/10/21 22:11:12]

it meant the asset could be removed (i.e. what this CL does)

-  if (theme_provider->HasCustomImage(IDR_THEME_TOOLBAR) ||
-      !ui::MaterialDesignController::IsModeMaterial()) {
+  if (theme_provider->HasCustomImage(IDR_THEME_TOOLBAR)) {
     canvas->TileImageInt(*theme_provider->GetImageSkiaNamed(IDR_THEME_TOOLBAR),
                          background_origin.x(),
                          background_origin.y(),
                          bounds.x(),
                          bounds.y(),
                          bounds.width(),
                          bounds.height());
   }
-
-#if defined(USE_ASH)
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    // The pre-material design version of Ash provides additional lightening
-    // at the edges of the toolbar.
-    gfx::ImageSkia* toolbar_left =
-        theme_provider->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_LEFT);
-    canvas->TileImageInt(*toolbar_left,
-                         bounds.x(),
-                         bounds.y(),
-                         toolbar_left->width(),
-                         bounds.height());
-    gfx::ImageSkia* toolbar_right =
-        theme_provider->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_RIGHT);
-    canvas->TileImageInt(*toolbar_right,
-                         bounds.right() - toolbar_right->width(),
-                         bounds.y(),
-                         toolbar_right->width(),
-                         bounds.height());
-  }
-#endif  // USE_ASH
 }
 
 void PaintAttachedBookmarkBar(gfx::Canvas* canvas,
                               BookmarkBarView* view,
                               BrowserView* browser_view,
                               int toolbar_overlap) {
-  // Paint background for attached state, this is fade in/out.
+  // Paint background for attached state.
   gfx::Point background_image_offset =
       browser_view->OffsetPointForToolbarBackgroundImage(
           gfx::Point(view->GetMirroredX(), view->y()));
   PaintBackgroundAttachedMode(canvas, view->GetThemeProvider(),
                               view->GetLocalBounds(), background_image_offset);
   if (view->height() >= toolbar_overlap) {
-    // Draw the separator below the Bookmarks Bar; this is fading in/out.
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      BrowserView::Paint1pxHorizontalLine(
-          canvas, view->GetThemeProvider()->GetColor(
-                      ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
-          view->GetLocalBounds(), true);
-    } else {
-      PaintHorizontalBorder(
-          canvas, view, false,
-          view->GetThemeProvider()->GetColor(
-              ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR));
-    }
+    BrowserView::Paint1pxHorizontalLine(
+        canvas, view->GetThemeProvider()->GetColor(
+                    ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR),
+        view->GetLocalBounds(), true);
   }
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // Delegate implementation for BrowserViewLayout. Usually just forwards calls
 // into BrowserView.
 class BrowserViewLayoutDelegateImpl : public BrowserViewLayoutDelegate {
  public:
@@ skipping 1609 matching lines @@
 
 void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
 void BrowserView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_CLIENT;
 }
 
 void BrowserView::OnThemeChanged() {
-  if (!IsRegularOrGuestSession() &&
-      ui::MaterialDesignController::IsModeMaterial()) {
+  if (!IsRegularOrGuestSession()) {
     // When the theme changes, the native theme may also change (in incognito,
     // the usage of dark or normal hinges on the browser theme), so we have to
     // propagate both kinds of change.
     base::AutoReset<bool> reset(&handling_theme_changed_, true);
 #if defined(OS_WIN)
     ui::NativeThemeDarkWin::instance()->NotifyObservers();
     ui::NativeThemeWin::instance()->NotifyObservers();
 #elif defined(OS_LINUX)
     ui::NativeThemeDarkAura::instance()->NotifyObservers();
     ui::NativeThemeAura::instance()->NotifyObservers();
@@ skipping 674 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }