| Index: ui/resources/ui_resources_2x.grd
|
| diff --git a/ui/resources/ui_resources_2x.grd b/ui/resources/ui_resources_2x.grd
|
| index 553afc8e4ea48ccaba8c06a93a14fcd1e1df8e75..e033fc239a53b0fd0403ed05217df96b16cc5727 100644
|
| --- a/ui/resources/ui_resources_2x.grd
|
| +++ b/ui/resources/ui_resources_2x.grd
|
| @@ -15,71 +15,71 @@
|
| ui_resources_standard.grd and ui_resources_touch.grd. THIS MEANS THAT
|
| EACH ICON IN THIS FILE MUST HAVE AN EQUIVALENT ICON IN THE OTHER
|
| FILES. -->
|
| - <include name="IDR_BUBBLE_B" file="bubble_b_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_BL" file="bubble_bl_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_BR" file="bubble_br_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_B_ARROW" file="bubble_pointer_b_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_L" file="bubble_l_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_L_ARROW" file="bubble_pointer_l_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_R" file="bubble_r_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_R_ARROW" file="bubble_pointer_r_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_T" file="bubble_t_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_TL" file="bubble_tl_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_TR" file="bubble_tr_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t_2x.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_B" file="default_200_percent/bubble_b.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_BL" file="default_200_percent/bubble_bl.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_BR" file="default_200_percent/bubble_br.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_B_ARROW" file="default_200_percent/bubble_pointer_b.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_L" file="default_200_percent/bubble_l.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_L_ARROW" file="default_200_percent/bubble_pointer_l.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_R" file="default_200_percent/bubble_r.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_R_ARROW" file="default_200_percent/bubble_pointer_r.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_T" file="default_200_percent/bubble_t.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_TL" file="default_200_percent/bubble_tl.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_TR" file="default_200_percent/bubble_tr.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_T_ARROW" file="default_200_percent/bubble_pointer_t.png" type="BINDATA" />
|
|
|
| - <include name="IDR_BUBBLE_SHADOW_B" file="bubble_shadow_b_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_BL" file="bubble_shadow_bl_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_BR" file="bubble_shadow_br_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_L" file="bubble_shadow_l_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_R" file="bubble_shadow_r_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_T" file="bubble_shadow_t_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_TL" file="bubble_shadow_tl_2x.png" type="BINDATA" />
|
| - <include name="IDR_BUBBLE_SHADOW_TR" file="bubble_shadow_tr_2x.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_B" file="default_200_percent/bubble_shadow_b.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_BL" file="default_200_percent/bubble_shadow_bl.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_BR" file="default_200_percent/bubble_shadow_br.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_L" file="default_200_percent/bubble_shadow_l.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_R" file="default_200_percent/bubble_shadow_r.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_T" file="default_200_percent/bubble_shadow_t.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_TL" file="default_200_percent/bubble_shadow_tl.png" type="BINDATA" />
|
| + <include name="IDR_BUBBLE_SHADOW_TR" file="default_200_percent/bubble_shadow_tr.png" type="BINDATA" />
|
|
|
| - <include name="IDR_CLOSE_BAR" file="close_bar_2x.png" type="BINDATA" />
|
| - <include name="IDR_CLOSE_BAR_H" file="close_bar_h_2x.png" type="BINDATA" />
|
| - <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask_2x.png" type="BINDATA" />
|
| - <include name="IDR_CLOSE_BAR_P" file="close_bar_p_2x.png" type="BINDATA" />
|
| + <include name="IDR_CLOSE_BAR" file="default_200_percent/close_bar.png" type="BINDATA" />
|
| + <include name="IDR_CLOSE_BAR_H" file="default_200_percent/close_bar_hover.png" type="BINDATA" />
|
| + <include name="IDR_CLOSE_BAR_MASK" file="default_200_percent/close_bar_mask.png" type="BINDATA" />
|
| + <include name="IDR_CLOSE_BAR_P" file="default_200_percent/close_bar_pressed.png" type="BINDATA" />
|
|
|
| <!-- Remaining images only used by Aura. -->
|
| <!-- TODO(flackr): These are 1x assets, we have to replace these before
|
| attempting to use them at 2x where they will be rendered as half
|
| the intended size. -->
|
| <if expr="pp_ifdef('use_aura')">
|
| - <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="aura/window_button_separator.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_CLOSE" file="aura/window_close_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_CLOSE_H" file="aura/window_close_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_CLOSE_P" file="aura/window_close_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="aura/window_fullscreen_close_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="aura/window_fullscreen_close_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="aura/window_fullscreen_close_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="aura/window_fullscreen_restore_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="aura/window_fullscreen_restore_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="aura/window_fullscreen_restore_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="aura/window_fullscreen_separator.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZE" file="aura/window_maximize_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="aura/window_maximize_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="aura/window_maximize_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="aura/window_maximized_close_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="aura/window_maximized_close_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="aura/window_maximized_close_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="aura/window_maximized_minimize_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="aura/window_maximized_minimize_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="aura/window_maximized_minimize_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="aura/window_maximized_snap_left_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="aura/window_maximized_snap_minimize_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="aura/window_maximized_snap_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="aura/window_maximized_snap_right_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="aura/window_maximized_restore_normal.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="aura/window_maximized_restore_hot.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="aura/window_maximized_restore_pressed.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="aura/window_snap_left_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="aura/window_snap_minimize_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_SNAP_P" file="aura/window_snap_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="aura/window_snap_right_p.png" type="BINDATA" />
|
| - <include name="IDR_AURA_CURSOR_NO_DROP" file="default_100/aura/left_ptr_nodrop.png" type="BINDATA" />
|
| - <include name="IDR_AURA_CURSOR_COPY" file="default_100/aura/left_ptr_copy.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="default_100_percent/aura/window_button_separator.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_CLOSE" file="default_100_percent/aura/window_close_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_CLOSE_H" file="default_100_percent/aura/window_close_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_CLOSE_P" file="default_100_percent/aura/window_close_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE" file="default_100_percent/aura/window_fullscreen_close_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_H" file="default_100_percent/aura/window_fullscreen_close_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_CLOSE_P" file="default_100_percent/aura/window_fullscreen_close_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE" file="default_100_percent/aura/window_fullscreen_restore_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_H" file="default_100_percent/aura/window_fullscreen_restore_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_RESTORE_P" file="default_100_percent/aura/window_fullscreen_restore_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_FULLSCREEN_SEPARATOR" file="default_100_percent/aura/window_fullscreen_separator.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZE" file="default_100_percent/aura/window_maximize_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZE_H" file="default_100_percent/aura/window_maximize_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZE_P" file="default_100_percent/aura/window_maximize_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE" file="default_100_percent/aura/window_maximized_close_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H" file="default_100_percent/aura/window_maximized_close_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P" file="default_100_percent/aura/window_maximized_close_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE" file="default_100_percent/aura/window_maximized_minimize_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H" file="default_100_percent/aura/window_maximized_minimize_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P" file="default_100_percent/aura/window_maximized_minimize_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_LEFT_P" file="default_100_percent/aura/window_maximized_snap_left_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_maximized_snap_minimize_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_P" file="default_100_percent/aura/window_maximized_snap_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_SNAP_RIGHT_P" file="default_100_percent/aura/window_maximized_snap_right_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE" file="default_100_percent/aura/window_maximized_restore_normal.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H" file="default_100_percent/aura/window_maximized_restore_hover.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P" file="default_100_percent/aura/window_maximized_restore_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_SNAP_LEFT_P" file="default_100_percent/aura/window_snap_left_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_SNAP_MINIMIZE_P" file="default_100_percent/aura/window_snap_minimize_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_SNAP_P" file="default_100_percent/aura/window_snap_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_WINDOW_SNAP_RIGHT_P" file="default_100_percent/aura/window_snap_right_pressed.png" type="BINDATA" />
|
| + <include name="IDR_AURA_CURSOR_NO_DROP" file="default_100_percent/aura/left_ptr_nodrop.png" type="BINDATA" />
|
| + <include name="IDR_AURA_CURSOR_COPY" file="default_100_percent/aura/left_ptr_copy.png" type="BINDATA" />
|
| </if>
|
| </includes>
|
| </release>
|
|
|