Land image assets for https://codereview.chromium.org/148003003/

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

 // Copyright (c) 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_non_client_frame_view_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/wm/frame_border_hit_test_controller.h"
 #include "ash/wm/header_painter.h"
@@ skipping 235 matching lines @@
   // The primary header image changes based on window activation state and
   // theme, so we look it up for each paint.
   int theme_frame_image_id = GetThemeFrameImageId();
   int theme_frame_overlay_image_id = GetThemeFrameOverlayImageId();
 
   ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (!theme_provider->HasCustomImage(theme_frame_image_id) &&
       (theme_frame_overlay_image_id == 0 ||
        !theme_provider->HasCustomImage(theme_frame_overlay_image_id))) {
     if (frame()->IsMaximized() || frame()->IsFullscreen())
-      theme_frame_image_id = IDR_AURA_WINDOW_HEADER_BASE_MINIMAL;
+      theme_frame_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED;
   }
   header_painter_->PaintHeader(
       canvas,
       theme_frame_image_id,
       theme_frame_overlay_image_id);
   if (browser_view()->ShouldShowWindowTitle())
     header_painter_->PaintTitleBar(canvas, BrowserFrame::GetTitleFontList());
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
   else
@@ skipping 162 matching lines @@
       browser_view()->immersive_mode_controller();
   return immersive_mode_controller->IsEnabled() &&
       (immersive_mode_controller->IsRevealed() ||
        UseImmersiveLightbarHeaderStyle());
 }
 
 void BrowserNonClientFrameViewAsh::PaintImmersiveLightbarStyleHeader(
     gfx::Canvas* canvas) {
   // The light bar header is not themed because theming it does not look good.
   gfx::ImageSkia* frame_image = GetThemeProvider()->GetImageSkiaNamed(
-      IDR_AURA_WINDOW_HEADER_BASE_MINIMAL);
+      IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
   canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->height());
 }
 
 void BrowserNonClientFrameViewAsh::PaintToolbarBackground(gfx::Canvas* canvas) {
   gfx::Rect toolbar_bounds(browser_view()->GetToolbarBounds());
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
@@ skipping 82 matching lines @@
     if (ShouldPaintAsActive()) {
       return is_incognito ?
           IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME;
     }
     return is_incognito ?
         IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE;
   }
   // Never theme app and popup windows.
   if (ShouldPaintAsActive()) {
     return is_incognito ?
-        IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE :
-        IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
+        IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE :
+        IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
   }
   return is_incognito ?
-      IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE :
-      IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
+      IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE :
+      IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
 }
 
 int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE;
   }
   return 0;
 }