ui: Fix usage of desktop_linux in our grd files.

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 4096fe269d4f4c86398eb7b284a6b158d8c8417b..f65a7cdd8259593c168a9ba84526a4e128c1b448 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -30,7 +30,7 @@
         <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_ON" file="common/app_list_mic_on.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_OFF" file="common/app_list_mic_off.png" />
         <structure type="chrome_scaled_image" name="IDR_APP_LIST_SPEECH_MIC_RECORDING" file="common/app_list_mic_recording.png" />
-        <if expr="is_win or desktop_linux">
+        <if expr="is_win or (is_linux and not chromeos)">
           <structure type="chrome_scaled_image" name="IDR_APP_LIST_USER_INDICATOR" file="common/app_list_user_indicator.png" />
         </if>
       </if>
@@ -167,10 +167,10 @@
         <structure type="chrome_scaled_image" name="IDR_CHECKBOX_PRESSED" file="common/checkbox_pressed.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_CHECKMARK" file="common/checkmark.png" />
-      <if expr="desktop_linux">
+      <if expr="is_linux and not chromeos">
         <structure type="chrome_scaled_image" name="IDR_CLOSE" file="linux/linux_close.png" />
       </if>
-      <if expr="not desktop_linux and toolkit_views">
+      <if expr="(not is_linux and chromeos) and 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" />
@@ -180,11 +180,11 @@
       <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="desktop_linux">
+      <if expr="is_linux and not chromeos">
         <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="not desktop_linux and toolkit_views">
+      <if expr="(not is_linux and chromeos) and 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>
@@ -281,12 +281,12 @@
         <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>
-      <if expr="desktop_linux">
+      <if expr="is_linux and not chromeos">
         <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="not desktop_linux and toolkit_views">
+      <if expr="(not is_linux and chromeos) and 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" />
@@ -318,12 +318,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="desktop_linux">
+      <if expr="is_linux and not chromeos">
         <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="not desktop_linux and toolkit_views">
+      <if expr="(not is_linux and chromeos) and 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" />
@@ -349,7 +349,7 @@
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_HOVER" file="common/notification_close_hover.png"/>
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLOSE_PRESSED" file="common/notification_close_pressed.png"/>
         </if>
-        <if expr="desktop_linux and use_aura">
+        <if expr="(is_linux and not chromeos) and use_aura">
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CLOSE" file="common/notification_bubble_close.png"/>
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CLOSE_HOVER" file="common/notification_bubble_close_hover.png"/>
           <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_BUBBLE_CLOSE_PRESSED" file="common/notification_bubble_close_pressed.png"/>
@@ -400,12 +400,12 @@
         <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" />
       </if>
-      <if expr="desktop_linux">
+      <if expr="is_linux and not chromeos">
         <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="not desktop_linux and toolkit_views">
+      <if expr="(not is_linux and chromeos) and 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" />