Move browser related image assets out of ash

BUG=340143 TEST=None R=oshima@chromium.org, oshima TBR=sky (For trivial renaming of image assets) Review URL: https://codereview.chromium.org/228753005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262463 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Apr 8, 2014 · 3bd9be0 · 3bd9be0
1 parent b9e0d85
commit 3bd9be0
Show file tree

Hide file tree

Showing 52 changed files with 78 additions and 78 deletions.
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
@@ -17,32 +17,6 @@
       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
            BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
            SAME CONDITIONALS. -->
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/browser_window_control_background_maximized_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P" file="common/browser_window_control_background_maximized_pressed.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H" file="common/browser_window_control_background_restored_hover.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P" file="common/browser_window_control_background_restored_pressed.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE" file="common/browser_window_control_icon_maximized_close.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED" file="common/browser_window_control_icon_maximized_left_snapped.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE" file="common/browser_window_control_icon_maximized_minimize.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED" file="common/browser_window_control_icon_maximized_right_snapped.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE" file="common/browser_window_control_icon_maximized_size.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE" file="common/browser_window_control_icon_restored_close.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED" file="common/browser_window_control_icon_restored_left_snapped.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE" file="common/browser_window_control_icon_restored_minimize.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED" file="common/browser_window_control_icon_restored_right_snapped.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE" file="common/browser_window_control_icon_restored_size.png" />
-
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED" file="common/browser_window_header_base_maximized.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE" file="common/browser_window_header_base_active.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE" file="common/browser_window_header_base_inactive.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE" file="common/browser_window_header_base_incognito_active.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE" file="common/browser_window_header_base_incognito_inactive.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT" file="common/browser_window_header_shade_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT" file="common/browser_window_header_shade_right.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP" file="common/browser_window_header_shade_top.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/browser_window_header_shade_top_left.png" />
-      <structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/browser_window_header_shade_top_right.png" />
-
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_BACKGROUND" file="common/launcher/launcher_background.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_CORNER" file="common/launcher/launcher_corner.png" />
       <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_DIMMING" file="common/launcher/launcher_dimming.png" />

diff --git a/...ow_control_background_maximized_hover.png → ...ow_control_background_maximized_hover.png b/...ow_control_background_maximized_hover.png → ...ow_control_background_maximized_hover.png
diff --git a/..._control_background_maximized_pressed.png → ..._control_background_maximized_pressed.png b/..._control_background_maximized_pressed.png → ..._control_background_maximized_pressed.png
diff --git a/...dow_control_background_restored_hover.png → ...dow_control_background_restored_hover.png b/...dow_control_background_restored_hover.png → ...dow_control_background_restored_hover.png
diff --git a/...w_control_background_restored_pressed.png → ...w_control_background_restored_pressed.png b/...w_control_background_restored_pressed.png → ...w_control_background_restored_pressed.png
diff --git a/...r_window_control_icon_maximized_close.png → ...r_window_control_icon_maximized_close.png b/...r_window_control_icon_maximized_close.png → ...r_window_control_icon_maximized_close.png
diff --git a/...w_control_icon_maximized_left_snapped.png → ...w_control_icon_maximized_left_snapped.png b/...w_control_icon_maximized_left_snapped.png → ...w_control_icon_maximized_left_snapped.png
diff --git a/...indow_control_icon_maximized_minimize.png → ...indow_control_icon_maximized_minimize.png b/...indow_control_icon_maximized_minimize.png → ...indow_control_icon_maximized_minimize.png
diff --git a/..._control_icon_maximized_right_snapped.png → ..._control_icon_maximized_right_snapped.png b/..._control_icon_maximized_right_snapped.png → ..._control_icon_maximized_right_snapped.png
diff --git a/...er_window_control_icon_maximized_size.png → ...er_window_control_icon_maximized_size.png b/...er_window_control_icon_maximized_size.png → ...er_window_control_icon_maximized_size.png
diff --git a/...er_window_control_icon_restored_close.png → ...er_window_control_icon_restored_close.png b/...er_window_control_icon_restored_close.png → ...er_window_control_icon_restored_close.png
diff --git a/...ow_control_icon_restored_left_snapped.png → ...ow_control_icon_restored_left_snapped.png b/...ow_control_icon_restored_left_snapped.png → ...ow_control_icon_restored_left_snapped.png
diff --git a/...window_control_icon_restored_minimize.png → ...window_control_icon_restored_minimize.png b/...window_control_icon_restored_minimize.png → ...window_control_icon_restored_minimize.png
diff --git a/...w_control_icon_restored_right_snapped.png → ...w_control_icon_restored_right_snapped.png b/...w_control_icon_restored_right_snapped.png → ...w_control_icon_restored_right_snapped.png
diff --git a/...ser_window_control_icon_restored_size.png → ...ser_window_control_icon_restored_size.png b/...ser_window_control_icon_restored_size.png → ...ser_window_control_icon_restored_size.png
diff --git a/...mon/browser_window_header_base_active.png → ...ash/browser_window_header_base_active.png b/...mon/browser_window_header_base_active.png → ...ash/browser_window_header_base_active.png
diff --git a/...n/browser_window_header_base_inactive.png → ...h/browser_window_header_base_inactive.png b/...n/browser_window_header_base_inactive.png → ...h/browser_window_header_base_inactive.png
diff --git a/...r_window_header_base_incognito_active.png → ...r_window_header_base_incognito_active.png b/...r_window_header_base_incognito_active.png → ...r_window_header_base_incognito_active.png
diff --git a/...window_header_base_incognito_inactive.png → ...window_header_base_incognito_inactive.png b/...window_header_base_incognito_inactive.png → ...window_header_base_incognito_inactive.png
diff --git a/.../browser_window_header_base_maximized.png → .../browser_window_header_base_maximized.png b/.../browser_window_header_base_maximized.png → .../browser_window_header_base_maximized.png
diff --git a/...mmon/browser_window_header_shade_left.png → .../ash/browser_window_header_shade_left.png b/...mmon/browser_window_header_shade_left.png → .../ash/browser_window_header_shade_left.png
diff --git a/...mon/browser_window_header_shade_right.png → ...ash/browser_window_header_shade_right.png b/...mon/browser_window_header_shade_right.png → ...ash/browser_window_header_shade_right.png
diff --git a/...ommon/browser_window_header_shade_top.png → ...n/ash/browser_window_header_shade_top.png b/...ommon/browser_window_header_shade_top.png → ...n/ash/browser_window_header_shade_top.png
diff --git a/.../browser_window_header_shade_top_left.png → .../browser_window_header_shade_top_left.png b/.../browser_window_header_shade_top_left.png → .../browser_window_header_shade_top_left.png
diff --git a/...browser_window_header_shade_top_right.png → ...browser_window_header_shade_top_right.png b/...browser_window_header_shade_top_right.png → ...browser_window_header_shade_top_right.png
diff --git a/...ow_control_background_maximized_hover.png → ...ow_control_background_maximized_hover.png b/...ow_control_background_maximized_hover.png → ...ow_control_background_maximized_hover.png
diff --git a/..._control_background_maximized_pressed.png → ..._control_background_maximized_pressed.png b/..._control_background_maximized_pressed.png → ..._control_background_maximized_pressed.png
diff --git a/...dow_control_background_restored_hover.png → ...dow_control_background_restored_hover.png b/...dow_control_background_restored_hover.png → ...dow_control_background_restored_hover.png
diff --git a/...w_control_background_restored_pressed.png → ...w_control_background_restored_pressed.png b/...w_control_background_restored_pressed.png → ...w_control_background_restored_pressed.png
diff --git a/...r_window_control_icon_maximized_close.png → ...r_window_control_icon_maximized_close.png b/...r_window_control_icon_maximized_close.png → ...r_window_control_icon_maximized_close.png
diff --git a/...w_control_icon_maximized_left_snapped.png → ...w_control_icon_maximized_left_snapped.png b/...w_control_icon_maximized_left_snapped.png → ...w_control_icon_maximized_left_snapped.png
diff --git a/...indow_control_icon_maximized_minimize.png → ...indow_control_icon_maximized_minimize.png b/...indow_control_icon_maximized_minimize.png → ...indow_control_icon_maximized_minimize.png
diff --git a/..._control_icon_maximized_right_snapped.png → ..._control_icon_maximized_right_snapped.png b/..._control_icon_maximized_right_snapped.png → ..._control_icon_maximized_right_snapped.png
diff --git a/...er_window_control_icon_maximized_size.png → ...er_window_control_icon_maximized_size.png b/...er_window_control_icon_maximized_size.png → ...er_window_control_icon_maximized_size.png
diff --git a/...er_window_control_icon_restored_close.png → ...er_window_control_icon_restored_close.png b/...er_window_control_icon_restored_close.png → ...er_window_control_icon_restored_close.png
diff --git a/...ow_control_icon_restored_left_snapped.png → ...ow_control_icon_restored_left_snapped.png b/...ow_control_icon_restored_left_snapped.png → ...ow_control_icon_restored_left_snapped.png
diff --git a/...window_control_icon_restored_minimize.png → ...window_control_icon_restored_minimize.png b/...window_control_icon_restored_minimize.png → ...window_control_icon_restored_minimize.png
diff --git a/...w_control_icon_restored_right_snapped.png → ...w_control_icon_restored_right_snapped.png b/...w_control_icon_restored_right_snapped.png → ...w_control_icon_restored_right_snapped.png
diff --git a/...ser_window_control_icon_restored_size.png → ...ser_window_control_icon_restored_size.png b/...ser_window_control_icon_restored_size.png → ...ser_window_control_icon_restored_size.png
diff --git a/...mon/browser_window_header_base_active.png → ...ash/browser_window_header_base_active.png b/...mon/browser_window_header_base_active.png → ...ash/browser_window_header_base_active.png
diff --git a/...n/browser_window_header_base_inactive.png → ...h/browser_window_header_base_inactive.png b/...n/browser_window_header_base_inactive.png → ...h/browser_window_header_base_inactive.png
diff --git a/...r_window_header_base_incognito_active.png → ...r_window_header_base_incognito_active.png b/...r_window_header_base_incognito_active.png → ...r_window_header_base_incognito_active.png
diff --git a/...window_header_base_incognito_inactive.png → ...window_header_base_incognito_inactive.png b/...window_header_base_incognito_inactive.png → ...window_header_base_incognito_inactive.png
diff --git a/.../browser_window_header_base_maximized.png → .../browser_window_header_base_maximized.png b/.../browser_window_header_base_maximized.png → .../browser_window_header_base_maximized.png
diff --git a/...mmon/browser_window_header_shade_left.png → .../ash/browser_window_header_shade_left.png b/...mmon/browser_window_header_shade_left.png → .../ash/browser_window_header_shade_left.png
diff --git a/...mon/browser_window_header_shade_right.png → ...ash/browser_window_header_shade_right.png b/...mon/browser_window_header_shade_right.png → ...ash/browser_window_header_shade_right.png
diff --git a/...ommon/browser_window_header_shade_top.png → ...n/ash/browser_window_header_shade_top.png b/...ommon/browser_window_header_shade_top.png → ...n/ash/browser_window_header_shade_top.png
diff --git a/.../browser_window_header_shade_top_left.png → .../browser_window_header_shade_top_left.png b/.../browser_window_header_shade_top_left.png → .../browser_window_header_shade_top_left.png
diff --git a/...browser_window_header_shade_top_right.png → ...browser_window_header_shade_top_right.png b/...browser_window_header_shade_top_right.png → ...browser_window_header_shade_top_right.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
@@ -68,6 +68,32 @@
         <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_H" file="win/app_window_minimize_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_P" file="win/app_window_minimize_active.png" />
       </if>
+      <if expr="use_ash">
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/ash/browser_window_control_background_maximized_hover.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P" file="common/ash/browser_window_control_background_maximized_pressed.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H" file="common/ash/browser_window_control_background_restored_hover.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P" file="common/ash/browser_window_control_background_restored_pressed.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE" file="common/ash/browser_window_control_icon_maximized_close.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED" file="common/ash/browser_window_control_icon_maximized_left_snapped.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE" file="common/ash/browser_window_control_icon_maximized_minimize.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED" file="common/ash/browser_window_control_icon_maximized_right_snapped.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE" file="common/ash/browser_window_control_icon_maximized_size.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE" file="common/ash/browser_window_control_icon_restored_close.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED" file="common/ash/browser_window_control_icon_restored_left_snapped.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE" file="common/ash/browser_window_control_icon_restored_minimize.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED" file="common/ash/browser_window_control_icon_restored_right_snapped.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE" file="common/ash/browser_window_control_icon_restored_size.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED" file="common/ash/browser_window_header_base_maximized.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE" file="common/ash/browser_window_header_base_active.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE" file="common/ash/browser_window_header_base_inactive.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE" file="common/ash/browser_window_header_base_incognito_active.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE" file="common/ash/browser_window_header_base_incognito_inactive.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_LEFT" file="common/ash/browser_window_header_shade_left.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_RIGHT" file="common/ash/browser_window_header_shade_right.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP" file="common/ash/browser_window_header_shade_top.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/ash/browser_window_header_shade_top_left.png" />
+        <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/ash/browser_window_header_shade_top_right.png" />
+      </if>
       <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON" file="common/autofill_dialog_menu_button_normal.png" />
       <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON_P" file="common/autofill_dialog_menu_button_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON_H" file="common/autofill_dialog_menu_button_hover.png" />

diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -282,15 +282,15 @@ void BrowserHeaderPainterAsh::PaintHighlightForRestoredWindow(
     gfx::Canvas* canvas) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia top_left_corner = *rb.GetImageSkiaNamed(
-      IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT);
+      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT);
   gfx::ImageSkia top_right_corner = *rb.GetImageSkiaNamed(
-      IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT);
+      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT);
   gfx::ImageSkia top_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP);
+      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP);
   gfx::ImageSkia left_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT);
+      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_LEFT);
   gfx::ImageSkia right_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT);
+      IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_RIGHT);
 
   int top_left_width = top_left_corner.width();
   int top_left_height = top_left_corner.height();
@@ -373,7 +373,7 @@ void BrowserHeaderPainterAsh::GetFrameImagesForTabbedBrowser(
       !tp->HasCustomImage(frame_image_id) &&
       frame_overlay_image_id == 0) {
     *frame_image = *tp->GetImageSkiaNamed(
-        IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
+        IDR_ASH_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
   } else {
     *frame_image = *tp->GetImageSkiaNamed(frame_image_id);
   }
@@ -386,81 +386,81 @@ gfx::ImageSkia BrowserHeaderPainterAsh::GetFrameImageForNonTabbedBrowser(
     Mode mode) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (frame_->IsMaximized() || frame_->IsFullscreen())
-    return *rb.GetImageSkiaNamed(IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
+    return *rb.GetImageSkiaNamed(IDR_ASH_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
 
   if (mode == MODE_ACTIVE) {
     return *rb.GetImageSkiaNamed(is_incognito_ ?
-        IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE :
-        IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE);
+        IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE :
+        IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE);
   }
   return *rb.GetImageSkiaNamed(is_incognito_ ?
-      IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE :
-      IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE);
+      IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE :
+      IDR_ASH_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE);
 }
 
 void BrowserHeaderPainterAsh::UpdateCaptionButtonImages() {
   if (frame_->IsMaximized() || frame_->IsFullscreen()) {
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P);
   } else {
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
     caption_button_container_->SetButtonImages(
         ash::CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
-        IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H,
+        IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P);
   }
 }
 

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -455,7 +455,7 @@ 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_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
+      IDR_ASH_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
   canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->height());
 }