linux_aura: Use the linux assets for the window caption buttons.

ui/resources/ui_resources.grd

Index: ui/resources/ui_resources.grd
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index dd510db015dcc8058b510b06fe0eda4405bd05b6..563f1c56d59be053817969ef131349e74e385c51 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -185,10 +185,10 @@
       <structure type="chrome_scaled_image" name="IDR_RADIO_HOVER" file="common/radio_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_RADIO_PRESSED" file="common/radio_pressed.png" />
       <structure type="chrome_scaled_image" name="IDR_TEXT_SELECTION_HANDLE" file="common/text_selection_handle_small.png" />
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx and not is_ios">
+      <if expr="pp_ifdef('desktop_linux')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE" file="linux/linux_close.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE" file="close.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_CLOSE_2" file="close_2.png" />
@@ -198,13 +198,15 @@
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG" file="close_dialog.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_H" file="close_dialog_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_CLOSE_DIALOG_P" file="close_dialog_pressed.png" />
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx and not is_ios">
+      <if expr="pp_ifdef('desktop_linux')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="linux/linux_close_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="linux/linux_close_pressed.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE_H" file="close_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_CLOSE_P" file="close_pressed.png" />
+      </if>
+      <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_CLOSE_SA" file="close_sa.png" />
         <structure type="chrome_scaled_image" name="IDR_CLOSE_SA_H" file="close_sa_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_CLOSE_SA_P" file="close_sa_pressed.png" />
@@ -224,15 +226,17 @@
       <structure type="chrome_scaled_image" name="IDR_FRAME" file="frame_default.png" />
       <structure type="chrome_scaled_image" name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" />
       <structure type="chrome_scaled_image" name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" />
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx and not is_ios">
+      <if expr="pp_ifdef('desktop_linux')">
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="linux/linux_maximize.png" />
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="linux/linux_maximize_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="linux/linux_maximize_pressed.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="maximize.png" />
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="maximize_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="maximize_pressed.png" />
+      </if>
+      <if expr="pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" file="common/menu_hierarchy_arrow.png" />
       </if>
       <if expr="is_macosx or is_ios">
@@ -257,12 +261,12 @@
       </if>
       <structure type="chrome_scaled_image" name="IDR_MENU_DROPARROW" file="cros/menu_droparrow.png" />
       <structure type="chrome_scaled_image" name="IDR_MESSAGE_CLOSE" file="common/message_close.png" />
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx and not is_ios">
+      <if expr="pp_ifdef('desktop_linux')">
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="linux/linux_minimize.png" />
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="linux/linux_minimize_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="linux/linux_minimize_pressed.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE" file="minimize.png" />
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE_H" file="minimize_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_MINIMIZE_P" file="minimize_pressed.png" />
@@ -340,12 +344,12 @@
         <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_TOP_H" file="cros/aura_scrollbar_thumb_vertical_hover_top.png" />
         <structure type="chrome_scaled_image" name="IDR_SCROLL_THUMB_VERTICAL_TOP_P" file="cros/aura_scrollbar_thumb_vertical_pressed_top.png" />
       </if>
-      <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx and not is_ios">
+      <if expr="pp_ifdef('desktop_linux')">
         <structure type="chrome_scaled_image" name="IDR_RESTORE" file="linux/linux_restore.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_H" file="linux/linux_restore_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_P" file="linux/linux_restore_pressed.png" />
       </if>
-      <if expr="pp_ifdef('toolkit_views')">
+      <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
         <structure type="chrome_scaled_image" name="IDR_RESTORE" file="restore.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_H" file="restore_hover.png" />
         <structure type="chrome_scaled_image" name="IDR_RESTORE_P" file="restore_pressed.png" />