Remove some more !IsModeMaterial code.

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

Index: chrome/browser/ui/views/frame/browser_header_painter_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index 66bc19c3cc5f7b1c391fba0676ac4171d081d4cd..4096cdaba1c66213bf6d85548b1469a6d4c3f8c8 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -13,14 +13,10 @@
 #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"
@@ -188,12 +184,6 @@ void BrowserHeaderPainterAsh::PaintHeader(gfx::Canvas* canvas, Mode mode) {
   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);
@@ -283,50 +273,6 @@ void BrowserHeaderPainterAsh::PaintFrameImages(gfx::Canvas* canvas,
       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();