Remove some more !IsModeMaterial code.

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

 // Copyright 2014 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_header_painter_ash.h"
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/header_painter_util.h"
 #include "base/logging.h"  // DCHECK
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
-#include "ui/base/material_design/material_design_controller.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
@@ skipping 147 matching lines @@
         activation_animation_->Reset(1);
       else
         activation_animation_->Reset(0);
     }
     initial_paint_ = false;
   }
 
   PaintFrameImages(canvas, false);
   PaintFrameImages(canvas, true);
 
-  if (!ui::MaterialDesignController::IsModeMaterial() &&
-      !frame_->IsMaximized() &&
-      !frame_->IsFullscreen()) {
-    PaintHighlightForRestoredWindow(canvas);
-  }
-
   if (frame_->widget_delegate() &&
       frame_->widget_delegate()->ShouldShowWindowTitle()) {
     PaintTitleBar(canvas);
   }
 }
 
 void BrowserHeaderPainterAsh::LayoutHeader() {
   // Purposefully set |painted_height_| to an invalid value. We cannot use
   // |painted_height_| because the computation of |painted_height_| may depend
   // on having laid out the window controls.
@@ skipping 69 matching lines @@
 
   SkPaint paint;
   paint.setBlendMode(SkBlendMode::kPlus);
   paint.setAlpha(alpha);
   paint.setColor(SkColorSetA(view_->GetFrameColor(active), alpha));
   PaintFrameImagesInRoundRect(
       canvas, frame_image, frame_overlay_image, paint, GetPaintedBounds(),
       corner_radius, ash::HeaderPainterUtil::GetThemeBackgroundXInset());
 }
 
-void BrowserHeaderPainterAsh::PaintHighlightForRestoredWindow(
-    gfx::Canvas* canvas) {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia top_left_corner = *rb.GetImageSkiaNamed(
-      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT);
-  gfx::ImageSkia top_right_corner = *rb.GetImageSkiaNamed(
-      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT);
-  gfx::ImageSkia top_edge = *rb.GetImageSkiaNamed(
-      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP);
-  gfx::ImageSkia left_edge = *rb.GetImageSkiaNamed(
-      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_LEFT);
-  gfx::ImageSkia right_edge = *rb.GetImageSkiaNamed(
-      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_RIGHT);
-
-  int top_left_width = top_left_corner.width();
-  int top_left_height = top_left_corner.height();
-  canvas->DrawImageInt(top_left_corner, 0, 0);
-
-  int top_right_width = top_right_corner.width();
-  int top_right_height = top_right_corner.height();
-  canvas->DrawImageInt(top_right_corner,
-                       view_->width() - top_right_width,
-                       0);
-
-  canvas->TileImageInt(
-      top_edge,
-      top_left_width,
-      0,
-      view_->width() - top_left_width - top_right_width,
-      top_edge.height());
-
-  canvas->TileImageInt(left_edge,
-                       0,
-                       top_left_height,
-                       left_edge.width(),
-                       painted_height_ - top_left_height);
-
-  canvas->TileImageInt(right_edge,
-                       view_->width() - right_edge.width(),
-                       top_right_height,
-                       right_edge.width(),
-                       painted_height_ - top_right_height);
-}
-
 void BrowserHeaderPainterAsh::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by its own views::View.
   gfx::Rect title_bounds = GetTitleBounds();
   title_bounds.set_x(view_->GetMirroredXForRect(title_bounds));
   canvas->DrawStringRectWithFlags(frame_->widget_delegate()->GetWindowTitle(),
                                   BrowserFrame::GetTitleFontList(),
                                   is_incognito_ ? kIncognitoWindowTitleTextColor
                                                 : kNormalWindowTitleTextColor,
                                   title_bounds,
                                   gfx::Canvas::NO_SUBPIXEL_RENDERING);
@@ skipping 27 matching lines @@
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {
   return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,
       caption_button_container_, BrowserFrame::GetTitleFontList());
 }