diff options
Diffstat (limited to 'ui/resources/ui_resources.grd')
| -rw-r--r-- | ui/resources/ui_resources.grd | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index a0a8fd2..a044cd0 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -35,29 +35,15 @@ <include name="IDR_FOLDER_CLOSED_RTL" file="folder_closed_rtl.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN" file="folder_open.png" type="BINDATA" /> <include name="IDR_FOLDER_OPEN_RTL" file="folder_open_rtl.png" type="BINDATA" /> - <if expr="pp_ifdef('use_aura')"> - <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. --> - <include name="IDR_FRAME" file="aura/frame_default.png" type="BINDATA" /> - <include name="IDR_FRAME_APP_PANEL" file="aura/frame_app_panel_default.png" type="BINDATA" /> - <include name="IDR_FRAME_INACTIVE" file="aura/frame_default_inactive.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_aura')"> - <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" /> - <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" /> - <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" /> - </if> - <if expr="pp_ifdef('use_aura')"> - <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. --> - <include name="IDR_MAXIMIZE" file="aura/maximize.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_H" file="aura/maximize_h.png" type="BINDATA" /> - <include name="IDR_MAXIMIZE_P" file="aura/maximize_p.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_aura') and pp_ifdef('toolkit_views')"> + <include name="IDR_FRAME" file="frame_default.png" type="BINDATA" /> + <include name="IDR_FRAME_APP_PANEL" file="frame_app_panel_default.png" type="BINDATA" /> + <include name="IDR_FRAME_INACTIVE" file="frame_default_inactive.png" type="BINDATA" /> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_MAXIMIZE" file="maximize.png" type="BINDATA" /> <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" /> <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('use_aura') and not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" /> <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" /> <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" /> @@ -74,18 +60,12 @@ <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" /> <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" /> </if> - <if expr="pp_ifdef('use_aura')"> - <!-- TODO(jamescook): Delete these when Aura uses its own custom window frame, BrowserNonClientFrameViewAura. --> - <include name="IDR_RESTORE" file="aura/restore.png" type="BINDATA" /> - <include name="IDR_RESTORE_H" file="aura/restore_h.png" type="BINDATA" /> - <include name="IDR_RESTORE_P" file="aura/restore_p.png" type="BINDATA" /> - </if> - <if expr="not pp_ifdef('use_aura') and pp_ifdef('toolkit_views')"> + <if expr="pp_ifdef('toolkit_views')"> <include name="IDR_RESTORE" file="restore.png" type="BINDATA" /> <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" /> <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" /> </if> - <if expr="not pp_ifdef('use_aura') and not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> + <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" /> <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" /> <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" /> |