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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/theme/theme_resources.grd

Issue 22600003: Switch to using '-t ios' for grit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 4 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 | « chrome/app/resources/locale_settings_mac.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/theme/theme_resources.grd
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index ab3336ee6135275eafc85debf09751639564f986..47f44293e13821598d907cdc0791439711d72a78 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -76,7 +76,7 @@
<structure type="chrome_scaled_image" name="IDR_AUTOFILL_GENERATED_CARD" file="common/autofill_generated_card.png" />
<structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON" file="common/autofill_tooltip_icon.png" />
<structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON_H" file="common/autofill_tooltip_icon_hover.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_BACK" file="back.png" />
<structure type="chrome_scaled_image" name="IDR_BACK_D" file="back_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_BACK_H" file="back_hover.png" />
@@ -84,7 +84,7 @@
</if>
<!-- TODO(jamescook): Update all Chrome platforms to use the new art and metrics
from Ash, crbug.com/118228 -->
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_BACK" file="common/browser_back_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BACK_D" file="common/browser_back_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_BACK_H" file="common/browser_back_hover.png" />
@@ -110,10 +110,10 @@
<structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file="common/blocked_pepper_broker.png" />
<structure type="chrome_scaled_image" name="IDR_BOOKMARKS_FAVICON" file="common/favicon_bookmarks.png" />
<structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_CHEVRONS" file="common/chevron.png" />
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" file="mac/bookmark_bar_folder.png" />
</if>
- <if expr="not is_macosx">
+ <if expr="not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" file="common/bookmark_bar_folder.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT" file="common/apps_bookmark_bar_icon.png" />
@@ -122,12 +122,12 @@
<structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_RECORD_VIDEO" file="record_video.png" />
<structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_PHOTO" file="take_photo.png" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="browser_action.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="browser_action_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="browser_action_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION" file="common/browser_action_normal.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_H" file="common/browser_action_hover.png" />
<structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_P" file="common/browser_action_pressed.png" />
@@ -317,13 +317,13 @@
<structure type="chrome_scaled_image" name="IDR_FIND_DLG_MIDDLE_BACKGROUND" file="common/find_dlg_middle_bg.png" />
<structure type="chrome_scaled_image" name="IDR_FIND_DLG_RIGHT_BACKGROUND" file="common/find_dlg_right_bg.png" />
<structure type="chrome_scaled_image" name="IDR_FLAGS_FAVICON" file="common/favicon_flags.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_FORWARD" file="forward.png" />
<structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="forward_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="forward_hover.png" />
<structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="forward_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_FORWARD" file="common/browser_forward_normal.png" />
<structure type="chrome_scaled_image" name="IDR_FORWARD_D" file="common/browser_forward_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_FORWARD_H" file="common/browser_forward_hover.png" />
@@ -337,26 +337,26 @@
<structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="help_16.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_HISTORY_FAVICON" file="common/favicon_history.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_HOME" file="home.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_HOME" file="common/browser_home_normal.png" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_HOME_H" file="home_hover.png" />
<structure type="chrome_scaled_image" name="IDR_HOME_P" file="home_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_HOME_H" file="common/browser_home_hover.png" />
<structure type="chrome_scaled_image" name="IDR_HOME_P" file="common/browser_home_pressed.png" />
</if>
- <if expr="not is_android and not pp_ifdef('ios')">
+ <if expr="not is_android and not is_ios">
<structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER24" file="icon_add_user24.png" />
<structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" file="icon_add_user_white.png" />
<structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file="icon_guest_white.png" />
</if>
- <if expr="not is_android and not pp_ifdef('ios') and not pp_ifdef('chromeos')">
+ <if expr="not is_android and not is_ios and not pp_ifdef('chromeos')">
<!-- TODO(noms): Remove this once local profile avatars are migrated -->
<structure type="chrome_scaled_image" name="IDR_USER_MANAGER_DEFAULT_AVATAR" file="avatar_user_color.png" />
</if>
@@ -491,13 +491,13 @@
<structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD" file="cros/network_show_password.png" />
<structure type="chrome_scaled_image" name="IDR_NETWORK_SHOW_PASSWORD_HOVER" file="cros/network_show_password_hover.png" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="newtab.png" />
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="newtab_hover.png" />
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="newtab_button_mask.png" />
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="newtab_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON" file="common/newtab_normal.png" />
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_H" file="common/newtab_hover.png" />
<structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_MASK" file="common/newtab_button_mask.png" />
@@ -565,10 +565,10 @@
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_WARNING" file="common/omnibox_https_warning.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP_DARK" file="common/omnibox_http_dark.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP_SELECTED" file="common/omnibox_http_selected.png" />
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_KEYWORD_HINT_TAB" file="mac/omnibox_keyword_hint_tab.png" />
</if>
- <if expr="not is_macosx">
+ <if expr="not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_KEYWORD_HINT_TAB" file="common/omnibox_keyword_hint_tab.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_MIC_SEARCH" file="common/omnibox_mic_search.png" />
@@ -601,7 +601,7 @@
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS" file="common/omnibox_tts.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_DARK" file="common/omnibox_tts_dark.png" />
<structure type="chrome_scaled_image" name="IDR_OMNIBOX_TTS_SELECTED" file="common/omnibox_tts_selected.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/otr_icon.png" />
</if>
<if expr="pp_ifdef('toolkit_views')">
@@ -615,7 +615,7 @@
</if>
</if>
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_icon.png" />
</if>
<if expr="context.startswith('default_')">
@@ -658,7 +658,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" file="google_chrome/product_logo_name_48.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic_mac.png" />
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_aqua_mac.png" />
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="profile_avatar_generic_blue_mac.png" />
@@ -686,7 +686,7 @@
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note_mac.png" />
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud_mac.png" />
</if>
- <if expr="not is_macosx">
+ <if expr="not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="profile_avatar_generic.png" />
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="profile_avatar_generic_aqua.png" />
<structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="profile_avatar_generic_blue.png" />
@@ -720,13 +720,13 @@
</if>
<structure type="chrome_scaled_image" name="IDR_PROFILE_SELECTED" file="common/profile_selected.png" />
<structure type="chrome_scaled_image" name="IDR_REGISTER_PROTOCOL_HANDLER" file="register_protocol_handler.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_RELOAD" file="reload.png" />
<structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="reload_hover.png" />
<structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="reload_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="reload_dimmed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_RELOAD" file="common/browser_reload_normal.png" />
<structure type="chrome_scaled_image" name="IDR_RELOAD_D" file="common/browser_reload_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="common/browser_reload_hover.png" />
@@ -756,7 +756,7 @@
<structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_linux_mic_empty.png" />
<structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_linux_mic_full.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_EMPTY" file="speech_input_tray_macosx_mic_empty.png" />
<structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_TRAY_MIC_FULL" file="speech_input_tray_macosx_mic_full.png" />
</if>
@@ -770,13 +770,13 @@
<structure type="chrome_scaled_image" name="IDR_SHARE" file="share.png" />
<structure type="chrome_scaled_image" name="IDR_STAR" file="star.png" />
<structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="star_lit.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_STOP" file="stop.png" />
<structure type="chrome_scaled_image" name="IDR_STOP_D" file="stop_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_STOP_H" file="stop_hover.png" />
<structure type="chrome_scaled_image" name="IDR_STOP_P" file="stop_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_STOP" file="common/browser_stop_normal.png" />
<structure type="chrome_scaled_image" name="IDR_STOP_D" file="common/browser_stop_disabled.png" />
<structure type="chrome_scaled_image" name="IDR_STOP_H" file="common/browser_stop_hover.png" />
@@ -786,7 +786,7 @@
<structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_START" file="cros/supervised_illustration_start.png" />
<structure type="chrome_scaled_image" name="IDR_SUPERVISED_ILLUSTRATION_DONE" file="cros/supervised_illsutration_done.png" />
</if>
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="tab_active_center.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="tab_active_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="tab_active_right.png" />
@@ -796,7 +796,7 @@
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="common/tab_active_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="common/tab_active_right.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="mac/tab_active_center.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_LEFT" file="mac/tab_active_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_RIGHT" file="mac/tab_active_right.png" />
@@ -807,7 +807,7 @@
<!-- Note: Tab close buttons are not traditional buttons. Tab close buttons
fill a background with a color from the theme, tile IDR_CLOSE_1 over it,
then apply IDR_CLOSE_1_MASK. See chrome/browser/ui/views/tabs/tab.cc -->
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="tab_alpha_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="tab_alpha_right.png" />
</if>
@@ -815,7 +815,7 @@
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="common/tab_alpha_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="common/tab_alpha_right.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_LEFT" file="mac/tab_alpha_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_ALPHA_RIGHT" file="mac/tab_alpha_right.png" />
</if>
@@ -825,7 +825,7 @@
<structure type="chrome_scaled_image" name="IDR_CLOSE_1_P" file="common/close_1_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_DROP_DOWN" file="tab_drop_down.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_DROP_UP" file="tab_drop_up.png" />
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" file="tab_inactive_center.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file="tab_inactive_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file="tab_inactive_right.png" />
@@ -835,7 +835,7 @@
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file="common/tab_inactive_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file="common/tab_inactive_right.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" file="mac/tab_inactive_center.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_LEFT" file="mac/tab_inactive_left.png" />
<structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_RIGHT" file="mac/tab_inactive_right.png" />
@@ -870,7 +870,7 @@
<structure type="chrome_scaled_image" name="IDR_THEME_NTP_ATTRIBUTION" file="notused.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND" file="common/ntp_background.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_NTP_BACKGROUND_WHITE" file="common/ntp_background_white.png" />
- <if expr="not pp_ifdef('use_ash') and not is_macosx">
+ <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="theme_tab_background.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="theme_tab_background_incognito.png" />
</if>
@@ -883,12 +883,12 @@
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN" file="theme_tab_background_incognito.png" />
</if>
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="mac/theme_default_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INACTIVE" file="mac/theme_default_inactive_background.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_V" file="theme_tab_background_glass.png" />
- <if expr="not pp_ifdef('use_ash') and not is_macosx">
+ <if expr="not pp_ifdef('use_ash') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" />
</if>
<if expr="pp_ifdef('use_ash')">
@@ -898,7 +898,7 @@
<structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" file="theme_toolbar_default.png" />
</if>
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="mac/theme_default_active.png" />
<structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_INACTIVE" file="mac/theme_default_active_background.png" />
</if>
@@ -917,17 +917,17 @@
<structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" file="common/toolbar_shade_right.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file="common/toolbar_shade_top.png" />
</if>
- <if expr="is_macosx">
+ <if expr="is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file="mac/toolbar_shade_top.png" />
</if>
<!-- For non-chromeos aura the tools menu button in the normal state is slightly different -->
<if expr="not pp_ifdef('use_aura') or pp_ifdef('chromeos')">
- <if expr="not pp_ifdef('toolkit_views') and not is_macosx">
+ <if expr="not pp_ifdef('toolkit_views') and not is_macosx and not is_ios">
<structure type="chrome_scaled_image" name="IDR_TOOLS" file="tools.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="tools_hover.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="tools_pressed.png" />
</if>
- <if expr="pp_ifdef('toolkit_views') or is_macosx">
+ <if expr="pp_ifdef('toolkit_views') or is_macosx or is_ios">
<structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLS_H" file="common/browser_tools_hover.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLS_P" file="common/browser_tools_pressed.png" />
@@ -947,7 +947,7 @@
<structure type="chrome_scaled_image" name="IDR_TOOLS_BAR_MEDIUM" file="common/browser_tools_bar_medium.png" />
<structure type="chrome_scaled_image" name="IDR_TOOLS_BAR_HIGH" file="common/browser_tools_bar_high.png" />
<structure type="chrome_scaled_image" name="IDR_UP_ARROW" file="common/up_arrow.png" />
- <if expr="not is_macosx and not pp_ifdef('toolkit_views')">
+ <if expr="not is_macosx and not is_ios and not pp_ifdef('toolkit_views')">
<structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE" file="update_badge.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE2" file="update_badge2.png" />
<structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE3" file="update_badge3.png" />
« no previous file with comments | « chrome/app/resources/locale_settings_mac.grd ('k') | chrome/browser/browser_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698