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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/resources/ui_resources.grd

Issue 161313002: Remove pp_ifdef from grd files in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: also removed pp_ifdef in xtb and css files Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/strings/ui_strings.grd ('k') | ui/webui/resources/css/chrome_shared.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/resources/ui_resources.grd
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 6365a290b594dc477674dd4387486bb64604c0a6..92d936a88c19ed73c294df92fe60f43bae5fcdef 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -14,7 +14,7 @@
<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
SAME CONDITIONALS. -->
- <if expr="pp_ifdef('enable_app_list')">
+ <if expr="enable_app_list">
<structure type="chrome_scaled_image" name="IDR_APP_LIST_ITEM_PROGRESS_BACKGROUND" file="common/app_list_progress_bar_background.png" />
<structure type="chrome_scaled_image" name="IDR_APP_LIST_ITEM_PROGRESS_LEFT" file="common/app_list_progress_bar_left.png" />
<structure type="chrome_scaled_image" name="IDR_APP_LIST_ITEM_PROGRESS_CENTER" file="common/app_list_progress_bar_center.png" />
@@ -30,12 +30,12 @@
<structure type="chrome_scaled_image" name="IDR_APP_LIST_USER_INDICATOR" file="win/app_list_user_indicator.png" />
</if>
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_APP_TOP_CENTER" file="app_top_center.png" />
<structure type="chrome_scaled_image" name="IDR_APP_TOP_LEFT" file="app_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_APP_TOP_RIGHT" file="app_top_right.png" />
</if>
- <if expr="is_linux and pp_ifdef('use_aura')">
+ <if expr="is_linux and use_aura">
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
@@ -97,7 +97,7 @@
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRAB" file="common/pointers/fleur.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRABBING" file="common/pointers/hand3.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM" file="common/window_shadow_active_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_LEFT" file="common/window_shadow_active_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_SHADOW_ACTIVE_BOTTOM_RIGHT" file="common/window_shadow_active_bottom_right.png" />
@@ -118,7 +118,7 @@
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_CENTER" file="common/browser_action_badge_center.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_LEFT" file="common/browser_action_badge_left.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="common/browser_action_badge_right.png" />
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_BUBBLE_B" file="bubble_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_BUBBLE_BL" file="bubble_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_BUBBLE_BR" file="bubble_bottom_right.png" />
@@ -161,10 +161,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="pp_ifdef('desktop_linux')">
+ <if expr="desktop_linux">
<structure type="chrome_scaled_image" name="IDR_CLOSE" file="linux/linux_close.png" />
</if>
- <if expr="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
+ <if expr="not desktop_linux 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" />
@@ -174,15 +174,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="pp_ifdef('desktop_linux')">
+ <if expr="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="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
+ <if expr="not desktop_linux 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>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_BOTTOM" file="common/combobox_button_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_H_BOTTOM" file="common/combobox_button_bottom_hover.png" />
<structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_P_BOTTOM" file="common/combobox_button_bottom_pressed.png" />
@@ -256,7 +256,7 @@
<structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_F_H_TOP_RIGHT" file="common/combobox_button_top_right_focused_hover.png" />
<structure type="chrome_scaled_image" name="IDR_COMBOBOX_BUTTON_F_P_TOP_RIGHT" file="common/combobox_button_top_right_focused_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_uses_gtk') or pp_ifdef('toolkit_views')">
+ <if expr="toolkit_uses_gtk or toolkit_views">
<structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_CENTER" file="content_bottom_center.png" />
<structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_LEFT_CORNER" file="content_bottom_left_corner.png" />
<structure type="chrome_scaled_image" name="IDR_CONTENT_BOTTOM_RIGHT_CORNER" file="content_bottom_right_corner.png" />
@@ -268,31 +268,31 @@
<structure type="chrome_scaled_image" name="IDR_DEFAULT_FAVICON_64" file="common/default_favicon_64.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED" file="common/folder_closed.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_CLOSED_RTL" file="common/folder_closed_rtl.png" />
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN" file="common/folder_open.png" />
<structure type="chrome_scaled_image" name="IDR_FOLDER_OPEN_RTL" file="common/folder_open_rtl.png" />
<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>
- <if expr="pp_ifdef('desktop_linux')">
+ <if expr="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="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
+ <if expr="not desktop_linux 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" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" file="common/menu_hierarchy_arrow.png" />
<structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW_DARK_BACKGROUND" file="common/menu_hierarchy_arrow_white.png" />
</if>
- <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')">
+ <if expr="(is_macosx or is_ios) and not toolkit_views">
<structure type="chrome_scaled_image" name="IDR_MENU_HIERARCHY_ARROW" file="mac/menu_hierarchy_arrow.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_MENU_CHECK" file="cros/menu_check.png" />
<structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED" file="common/menu_check.png" />
<structure type="chrome_scaled_image" name="IDR_MENU_CHECK_CHECKED_DARK_BACKGROUND" file="common/menu_check_white.png" />
@@ -312,17 +312,17 @@
</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="pp_ifdef('desktop_linux')">
+ <if expr="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="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
+ <if expr="not desktop_linux 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" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
+ <if expr="toolkit_views or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW" file="common/notification_arrow.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_HOVER" file="common/notification_arrow_hover.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_PRESSED" file="common/notification_arrow_pressed.png"/>
@@ -350,33 +350,33 @@
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_HOVER" file="common/notification_settings_hover.png"/>
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_SETTINGS_PRESSED" file="common/notification_settings_pressed.png"/>
</if>
- <if expr="pp_ifdef('use_aura')">
+ <if expr="use_aura">
<structure type="chrome_scaled_image" name="IDR_OAK" file="oak.png" />
</if>
- <if expr="pp_ifdef('chromeos')">
+ <if expr="chromeos">
<structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_HOVER" file="cros/action_box_button_hover.png" />
<structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_NORMAL" file="cros/action_box_button_normal.png" />
<structure type="chrome_scaled_image" name="IDR_OOBE_ACTION_BOX_BUTTON_PRESSED" file="cros/action_box_button_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_PANEL_TOP_LEFT_CORNER" file="panel_top_left_corner.png" />
<structure type="chrome_scaled_image" name="IDR_PANEL_TOP_RIGHT_CORNER" file="panel_top_right_corner.png" />
<structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_LEFT_CORNER" file="panel_bottom_left_corner.png" />
<structure type="chrome_scaled_image" name="IDR_PANEL_BOTTOM_RIGHT_CORNER" file="panel_bottom_right_corner.png" />
</if>
- <if expr="is_posix and not is_macosx and not is_ios and not pp_ifdef('use_aura')">
+ <if expr="is_posix and not is_macosx and not is_ios and not use_aura">
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linux/linux-progress-bar.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" file="linux/linux-progress-border-left.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" file="linux/linux-progress-border-right.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="linux/linux-progress-value.png" />
</if>
- <if expr="pp_ifdef('use_aura')">
+ <if expr="use_aura">
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BAR" file="linux/linux-progress-bar.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_LEFT" file="linux/linux-progress-border-left.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_BORDER_RIGHT" file="linux/linux-progress-border-right.png" />
<structure type="chrome_scaled_image" name="IDR_PROGRESS_VALUE" file="linux/linux-progress-value.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_RADIO" file="common/radio.png" />
<structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED" file="common/radio_checked.png" />
<structure type="chrome_scaled_image" name="IDR_RADIO_CHECKED_DISABLED" file="common/radio_checked_inactive.png" />
@@ -392,17 +392,17 @@
<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="pp_ifdef('desktop_linux')">
+ <if expr="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="not pp_ifdef('desktop_linux') and pp_ifdef('toolkit_views')">
+ <if expr="not desktop_linux 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" />
</if>
- <if expr="pp_ifdef('use_aura')">
+ <if expr="use_aura">
<structure type="chrome_scaled_image" name="IDR_SCROLLBAR_ARROW_BUTTON_BASE_HOVER_BOTTOM" file="common/aura_scrollbar_arrow_button_base_hover_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_SCROLLBAR_ARROW_BUTTON_BASE_HOVER_BOTTOM_LEFT" file="common/aura_scrollbar_arrow_button_base_hover_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_SCROLLBAR_ARROW_BUTTON_BASE_HOVER_BOTTOM_RIGHT" file="common/aura_scrollbar_arrow_button_base_hover_bottom_right.png" />
@@ -467,7 +467,7 @@
<structure type="chrome_scaled_image" name="IDR_SCROLLBAR_THUMB_BASE_PRESSED_TOP_LEFT" file="common/aura_scrollbar_thumb_base_pressed_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_SCROLLBAR_THUMB_BASE_PRESSED_TOP_RIGHT" file="common/aura_scrollbar_thumb_base_pressed_top_right.png" />
</if>
- <if expr="pp_ifdef('toolkit_uses_gtk') or pp_ifdef('toolkit_views')">
+ <if expr="toolkit_uses_gtk or toolkit_views">
<structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM" file="common/textbutton_hover_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_LEFT" file="common/textbutton_hover_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_HOVER_BOTTOM_RIGHT" file="common/textbutton_hover_bottom_right.png" />
@@ -487,11 +487,11 @@
<structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_LEFT" file="common/textbutton_pressed_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_TEXTBUTTON_PRESSED_TOP_RIGHT" file="common/textbutton_pressed_top_right.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_TEXT_SELECTION_HANDLE" file="common/text_selection_handle_small.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_THROBBER" file="throbber.png" />
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_COPY" file="common/drag_tip_copy.png" />
<structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_MOVE" file="common/drag_tip_move.png" />
<structure type="chrome_scaled_image" name="IDR_TOUCH_DRAG_TIP_LINK" file="common/drag_tip_link.png" />
@@ -507,7 +507,7 @@
<structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY" file="mac/notification_tray_empty.png"/>
<structure type="chrome_scaled_image" name="IDR_TRAY_EMPTY_PRESSED" file="mac/notification_tray_empty_pressed.png"/>
</if>
- <if expr="pp_ifdef('toolkit_uses_gtk') or pp_ifdef('toolkit_views')">
+ <if expr="toolkit_uses_gtk or toolkit_views">
<structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_CENTER" file="common/window_bottom_center.png" />
<structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_LEFT_CORNER" file="common/window_bottom_left_corner.png" />
<structure type="chrome_scaled_image" name="IDR_WINDOW_BOTTOM_RIGHT_CORNER" file="common/window_bottom_right_corner.png" />
@@ -517,7 +517,7 @@
<structure type="chrome_scaled_image" name="IDR_WINDOW_TOP_LEFT_CORNER" file="common/window_top_left_corner.png" />
<structure type="chrome_scaled_image" name="IDR_WINDOW_TOP_RIGHT_CORNER" file="common/window_top_right_corner.png" />
</if>
- <if expr="pp_ifdef('toolkit_views')">
+ <if expr="toolkit_views">
<structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM" file="common/window_bubble_shadow_big_bottom.png" />
<structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM_LEFT" file="common/window_bubble_shadow_big_bottom_left.png" />
<structure type="chrome_scaled_image" name="IDR_WINDOW_BUBBLE_SHADOW_BIG_BOTTOM_RIGHT" file="common/window_bubble_shadow_big_bottom_right.png" />
« no previous file with comments | « ui/base/strings/ui_strings.grd ('k') | ui/webui/resources/css/chrome_shared.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698