Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/resources/ui_resources.grd

Issue 782673002: MacViews: tryjobs for toolkit_views=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: With SetNativeWindowProperty Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_mac.mm ('k') | ui/views/cocoa/bridged_content_view.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent"> 4 <output filename="grit/ui_resources.h" type="rc_header" context="default_100 _percent">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" /> 7 <output filename="grit/ui_resources_map.cc" type="resource_map_source" conte xt="default_100_percent" />
8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" /> 8 <output filename="grit/ui_resources_map.h" type="resource_map_header" contex t="default_100_percent" />
9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" /> 9 <output filename="ui_resources_100_percent.pak" type="data_package" context= "default_100_percent" />
10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" /> 10 <output filename="ui_resources_200_percent.pak" type="data_package" context= "default_200_percent" />
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 <if expr="desktop_linux"> 289 <if expr="desktop_linux">
290 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="linux/li nux_maximize.png" /> 290 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="linux/li nux_maximize.png" />
291 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="linux/ linux_maximize_hover.png" /> 291 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="linux/ linux_maximize_hover.png" />
292 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="linux/ linux_maximize_pressed.png" /> 292 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="linux/ linux_maximize_pressed.png" />
293 </if> 293 </if>
294 <if expr="not desktop_linux and toolkit_views"> 294 <if expr="not desktop_linux and toolkit_views">
295 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="maximize .png" /> 295 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE" file="maximize .png" />
296 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="maximi ze_hover.png" /> 296 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_H" file="maximi ze_hover.png" />
297 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="maximi ze_pressed.png" /> 297 <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_P" file="maximi ze_pressed.png" />
298 </if> 298 </if>
299 <if expr="toolkit_views and not (is_macosx or is_ios)">
300 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" fi le="common/menu_hierarchy_arrow.png" />
301 </if>
299 <if expr="toolkit_views"> 302 <if expr="toolkit_views">
300 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" fi le="common/menu_hierarchy_arrow.png" />
301 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW_DAR K_BACKGROUND" file="common/menu_hierarchy_arrow_white.png" /> 303 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW_DAR K_BACKGROUND" file="common/menu_hierarchy_arrow_white.png" />
302 </if> 304 </if>
303 <if expr="(is_macosx or is_ios) and not toolkit_views"> 305 <if expr="is_macosx or is_ios">
304 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" fi le="mac/menu_hierarchy_arrow.png" /> 306 <structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" fi le="mac/menu_hierarchy_arrow.png" />
305 </if> 307 </if>
306 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED" file=" common/menu_check.png" /> 308 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED" file=" common/menu_check.png" />
307 <if expr="toolkit_views"> 309 <if expr="toolkit_views">
308 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK" file="cros/m enu_check.png" /> 310 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK" file="cros/m enu_check.png" />
309 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED_DARK_ BACKGROUND" file="common/menu_check_white.png" /> 311 <structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED_DARK_ BACKGROUND" file="common/menu_check_white.png" />
310 <structure type="chrome_scaled_image" name="IDR_MENU_RADIO_EMPTY" file=" common/menu_radio_empty.png" /> 312 <structure type="chrome_scaled_image" name="IDR_MENU_RADIO_EMPTY" file=" common/menu_radio_empty.png" />
311 <structure type="chrome_scaled_image" name="IDR_MENU_RADIO_SELECTED" fil e="common/menu_radio_selected.png" /> 313 <structure type="chrome_scaled_image" name="IDR_MENU_RADIO_SELECTED" fil e="common/menu_radio_selected.png" />
312 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_LEFT" file ="slider_left_active.png" /> 314 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_LEFT" file ="slider_left_active.png" />
313 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_RIGHT" fil e="slider_right_active.png" /> 315 <structure type="chrome_scaled_image" name="IDR_SLIDER_ACTIVE_RIGHT" fil e="slider_right_active.png" />
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_H OVER" file="cros/action_box_button_hover.png" /> 379 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_H OVER" file="cros/action_box_button_hover.png" />
378 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_N ORMAL" file="cros/action_box_button_normal.png" /> 380 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_N ORMAL" file="cros/action_box_button_normal.png" />
379 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_P RESSED" file="cros/action_box_button_pressed.png" /> 381 <structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_P RESSED" file="cros/action_box_button_pressed.png" />
380 </if> 382 </if>
381 <if expr="toolkit_views"> 383 <if expr="toolkit_views">
382 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" f ile="panel_top_left_corner.png" /> 384 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" f ile="panel_top_left_corner.png" />
383 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" file="panel_top_right_corner.png" /> 385 <structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" file="panel_top_right_corner.png" />
384 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER " file="panel_bottom_left_corner.png" /> 386 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER " file="panel_bottom_left_corner.png" />
385 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNE R" file="panel_bottom_right_corner.png" /> 387 <structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNE R" file="panel_bottom_right_corner.png" />
386 </if> 388 </if>
387 <if expr="is_posix and not is_macosx and not is_ios and not use_aura"> 389 <if expr="is_posix and not is_macosx and not is_ios and not toolkit_views" >
388 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linu x/linux-progress-bar.png" /> 390 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linu x/linux-progress-bar.png" />
389 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" fi le="linux/linux-progress-border-left.png" /> 391 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" fi le="linux/linux-progress-border-left.png" />
390 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" f ile="linux/linux-progress-border-right.png" /> 392 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" f ile="linux/linux-progress-border-right.png" />
391 <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="li nux/linux-progress-value.png" /> 393 <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="li nux/linux-progress-value.png" />
392 </if> 394 </if>
393 <if expr="use_aura"> 395 <if expr="toolkit_views">
394 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linu x/linux-progress-bar.png" /> 396 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linu x/linux-progress-bar.png" />
395 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" fi le="linux/linux-progress-border-left.png" /> 397 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" fi le="linux/linux-progress-border-left.png" />
396 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" f ile="linux/linux-progress-border-right.png" /> 398 <structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" f ile="linux/linux-progress-border-right.png" />
397 <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="li nux/linux-progress-value.png" /> 399 <structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="li nux/linux-progress-value.png" />
398 </if> 400 </if>
399 <if expr="toolkit_views"> 401 <if expr="toolkit_views">
400 <structure type="chrome_scaled_image" name="IDR_RADIO" file="common/radi o.png" /> 402 <structure type="chrome_scaled_image" name="IDR_RADIO" file="common/radi o.png" />
401 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED" file="com mon/radio_checked.png" /> 403 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED" file="com mon/radio_checked.png" />
402 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED_DISABLED" file="common/radio_checked_inactive.png" /> 404 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED_DISABLED" file="common/radio_checked_inactive.png" />
403 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED_HOVER" fil e="common/radio_checked_hover.png" /> 405 <structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED_HOVER" fil e="common/radio_checked_hover.png" />
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" /> 587 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_LEFT" file="common/window_bubble_shadow_small_top_left.png" />
586 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" /> 588 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SMA LL_TOP_RIGHT" file="common/window_bubble_shadow_small_top_right.png" />
587 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" /> 589 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_BOTTOM" file="common/window_bubble_shadow_spike_small_bottom.png" />
588 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" /> 590 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_LEFT" file="common/window_bubble_shadow_spike_small_left.png" />
589 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" /> 591 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_RIGHT" file="common/window_bubble_shadow_spike_small_right.png" />
590 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" /> 592 <structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_SPI KE_SMALL_TOP" file="common/window_bubble_shadow_spike_small_top.png" />
591 </if> 593 </if>
592 </structures> 594 </structures>
593 </release> 595 </release>
594 </grit> 596 </grit>
OLDNEW
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_mac.mm ('k') | ui/views/cocoa/bridged_content_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698