diff options
Diffstat (limited to 'chromium/chrome/app/theme/theme_resources.grd')
| -rw-r--r-- | chromium/chrome/app/theme/theme_resources.grd | 1254 |
1 files changed, 672 insertions, 582 deletions
diff --git a/chromium/chrome/app/theme/theme_resources.grd b/chromium/chrome/app/theme/theme_resources.grd index e035482cf5a..fa8ff526a69 100644 --- a/chromium/chrome/app/theme/theme_resources.grd +++ b/chromium/chrome/app/theme/theme_resources.grd @@ -18,55 +18,74 @@ <output filename="grit/theme_resources_map.h" type="resource_map_header" context="default_100_percent" /> <output filename="theme_resources_100_percent.pak" type="data_package" context="default_100_percent" /> <output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_percent" /> - <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" /> - <output filename="theme_resources_touch_140_percent.pak" type="data_package" context="touch_140_percent" /> - <output filename="theme_resources_touch_180_percent.pak" type="data_package" context="touch_180_percent" /> </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE SAME CONDITIONALS. --> - <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" /> + <structure type="chrome_scaled_image" name="IDR_ACCESSED_COOKIES" file="common/accessed_cookies.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_DOWNLOADS" file="common/allowed_downloads.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file="common/allowed_fullscreen.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="common/allowed_images.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file="common/allowed_script.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_LOCATION" file="common/allowed_location.png" /> - <structure type="chrome_scaled_image" name="IDR_ALLOWED_MICROPHONE" file="common/allowed_mic_only.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_MIDI_SYSEX" file="common/allowed_midi.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file="common/allowed_mouse_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file="common/allowed_notifications.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="common/allowed_plugins.png" /> <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="common/allowed_popups.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_droparrow.png" /> - <if expr="pp_ifdef('enable_app_list') and is_win and not pp_ifdef('_google_chrome')"> + <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="common/app_default_icon.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="common/app_droparrow.png" /> + <if expr="enable_app_list and is_win and not _google_chrome"> <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="chromium/app_list_48.png" /> </if> - <if expr="pp_ifdef('enable_app_list') and is_win and pp_ifdef('_google_chrome')"> + <if expr="enable_app_list and is_win and _google_chrome"> <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="google_chrome/app_list_48.png" /> <structure type="chrome_scaled_image" name="IDR_APP_LIST_SXS" file="google_chrome/app_list_sxs_48.png" /> </if> - <if expr="pp_ifdef('enable_app_list')"> + <if expr="enable_app_list and _google_chrome"> + <structure type="chrome_scaled_image" name="IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH" file="google_chrome/google_logo_voice_search.png" /> + </if> + <if expr="enable_app_list"> <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" file="common/app_list_v1_overlay.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_LIST_MIC_HOTWORD_OFF" file="common/app_list_mic_hotword_off.png" /> </if> <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media.png" /> - <if expr="pp_ifdef('toolkit_views')"> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file="win/app_window_close.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file="win/app_window_close_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file="win/app_window_close_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file="win/app_window_close_unfocused.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE" file="win/app_window_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" file="win/app_window_restore_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" file="win/app_window_restore_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" file="win/app_window_maximize.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_D" file="win/app_window_maximize_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_H" file="win/app_window_maximize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_P" file="win/app_window_maximize_active.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE" file="win/app_window_minimize.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_H" file="win/app_window_minimize_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_P" file="win/app_window_minimize_active.png" /> + <if expr="toolkit_views"> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file="common/app_window_close.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file="common/app_window_close_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file="common/app_window_close_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file="common/app_window_close_unfocused.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE" file="common/app_window_restore.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" file="common/app_window_restore_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_L" file="common/app_window_restore_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" file="common/app_window_restore_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" file="common/app_window_maximize.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_D" file="common/app_window_maximize_disabled.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_H" file="common/app_window_maximize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_L" file="common/app_window_maximize_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE_P" file="common/app_window_maximize_active.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE" file="common/app_window_minimize.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_H" file="common/app_window_minimize_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_L" file="common/app_window_minimize_light.png" /> + <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MINIMIZE_P" file="common/app_window_minimize_active.png" /> + </if> + <if expr="use_ash"> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/ash/browser_window_control_background_maximized_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P" file="common/ash/browser_window_control_background_maximized_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H" file="common/ash/browser_window_control_background_restored_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P" file="common/ash/browser_window_control_background_restored_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_CLOSE" file="common/ash/browser_window_control_icon_close.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_LEFT_SNAPPED" file="common/ash/browser_window_control_icon_left_snapped.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_MINIMIZE" file="common/ash/browser_window_control_icon_minimize.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_RIGHT_SNAPPED" file="common/ash/browser_window_control_icon_right_snapped.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_CONTROL_ICON_SIZE" file="common/ash/browser_window_control_icon_size.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_LEFT" file="common/ash/browser_window_header_shade_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_RIGHT" file="common/ash/browser_window_header_shade_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP" file="common/ash/browser_window_header_shade_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/ash/browser_window_header_shade_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ASH_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/ash/browser_window_header_shade_top_right.png" /> </if> <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON" file="common/autofill_dialog_menu_button_normal.png" /> <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON_P" file="common/autofill_dialog_menu_button_pressed.png" /> @@ -74,32 +93,20 @@ <structure type="chrome_scaled_image" name="IDR_AUTOFILL_DIALOG_MENU_BUTTON_D" file="common/autofill_dialog_menu_button_disabled.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 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" /> - <structure type="chrome_scaled_image" name="IDR_BACK_P" file="back_pressed.png" /> - </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 or is_ios"> + <if expr="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" /> <structure type="chrome_scaled_image" name="IDR_BACK_P" file="common/browser_back_pressed.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH" file="notification_wrench.png" /> - <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_H" file="notification_wrench_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_BALLOON_WRENCH_P" file="notification_wrench_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_COOKIES" file="common/blocked_cookies.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_DOWNLOADS" file="common/blocked_downloads.png" /> - <structure type="chrome_scaled_image" name="IDR_BLOCKED_FULLSCREEN" file="common/blocked_fullscreen.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_IMAGES" file="common/blocked_images.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_JAVASCRIPT" file="common/blocked_script.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_LOCATION" file="common/blocked_location.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_MEDIA" file="common/blocked_media.png" /> - <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD" file="common/save_password.png" /> - <structure type="chrome_scaled_image" name="IDR_BLOCKED_MICROPHONE" file="common/blocked_mic_only.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIDI_SYSEX" file="common/blocked_midi.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_MOUSE_CURSOR" file="common/blocked_mouse_cursor.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_MIXED_CONTENT" file="common/blocked_mixed_content.png" /> @@ -107,76 +114,79 @@ <structure type="chrome_scaled_image" name="IDR_BLOCKED_PLUGINS" file="common/blocked_plugins.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_POPUPS" file="common/blocked_popups.png" /> <structure type="chrome_scaled_image" name="IDR_BLOCKED_PPAPI_BROKER" file="common/blocked_pepper_broker.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_KEYBOARD" file="cros/bluetooth_pairing_keyboard.png" /> + <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_MOUSE" file="cros/bluetooth_pairing_mouse.png" /> + <structure type="chrome_scaled_image" name="IDR_BLUETOOTH_PAIRING_TICK" file="cros/bluetooth_pairing_tick.png" /> + </if> <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 or is_ios"> <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER" file="mac/bookmark_bar_folder.png" /> + <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANAGED" file="mac/bookmark_bar_folder_managed.png" /> </if> <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" /> + <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_FOLDER_MANAGED" file="common/bookmark_bar_folder_managed.png" /> </if> <structure type="chrome_scaled_image" name="IDR_BOOKMARK_BAR_APPS_SHORTCUT" file="common/apps_bookmark_bar_icon.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE_FILE" file="choose_file.png" /> - <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 expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_CHOOSE_FILE" file="cros/choose_file.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_USER_IMAGE_TAKE_PHOTO" file="cros/take_photo.png" /> </if> - <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" /> - <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_HIGHLIGHT" file="browser_action_highlight.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_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" /> - <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTION_HIGHLIGHT" file="common/browser_action_highlight.png" /> </if> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW" file="common/browser_actions_overflow_normal.png" /> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="common/browser_actions_overflow_hover.png" /> <structure type="chrome_scaled_image" name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="common/browser_actions_overflow_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_CHEVRON_LEFT" file="common/chevron_left.png" /> + <structure type="chrome_scaled_image" name="IDR_CLOSE_BUTTON_MASK" file="common/close_button_mask.png" /> <if expr="is_win"> <structure type="chrome_scaled_image" name="IDR_CONFLICT_FAVICON" file="common/favicon_conflicts.png" /> </if> <!-- Ash doesn't draw rounded content area, so needs a special top image. --> - <if expr="not pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" /> + <if expr="not use_ash"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="common/content_top_center.png" /> </if> - <if expr="pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="cros/content_top_center.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN" file="content_top_center.png" /> + <if expr="use_ash"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER" file="common/ash/content_top_center.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_DESKTOP" file="common/content_top_center.png" /> </if> </if> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="content_top_left_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="content_top_left_corner_mask.png" /> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" /> - <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="content_top_right_corner_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" file="common/content_top_left_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MASK" file="common/content_top_left_corner_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="common/content_top_right_corner.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_MASK" file="common/content_top_right_corner_mask.png" /> <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSION" file="common/controlled_setting_extension.png" /> <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATORY" file="common/controlled_setting_mandatory.png" /> - <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="cookie.png" /> - <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file="cookie_storage.png" /> + <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER" file="common/controlled_setting_owner.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_SHARED" file="cros/controlled_setting_shared.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="common/cookie.png" /> + <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file="common/cookie_storage.png" /> <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file="common/credit_card_cvc_hint.png" /> <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" file="common/credit_card_cvc_hint_amex.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_CRITICAL_ERROR" file="cros/critical_error.png" /> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_CROS_DEFAULT_THROBBER" file="cros/default_throbber.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_CWS_STAR_EMPTY" file="cws_star_empty.png" /> - <structure type="chrome_scaled_image" name="IDR_CWS_STAR_FULL" file="cws_star_full.png" /> - <structure type="chrome_scaled_image" name="IDR_CWS_STAR_HALF" file="cws_star_half.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_DIVIDER_VERT" file="divider_vert.png" /> - </if> - <structure type="chrome_scaled_image" name="IDR_DOCK_HIGH" file="dock_tab_high.png" /> - <structure type="chrome_scaled_image" name="IDR_DOCK_MAX" file="dock_tab_max.png" /> - <structure type="chrome_scaled_image" name="IDR_DOCK_WIDE" file="dock_tab_wide.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM_LEFT" file="common/developer_mode_highlight_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM" file="common/developer_mode_highlight_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_BOTTOM_RIGHT" file="common/developer_mode_highlight_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_CENTER" file="common/developer_mode_highlight_center.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_LEFT" file="common/developer_mode_highlight_left.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_RIGHT" file="common/developer_mode_highlight_right.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_TOP_LEFT" file="common/developer_mode_highlight_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_TOP" file="common/developer_mode_highlight_top.png" /> + <structure type="chrome_scaled_image" name="IDR_DEVELOPER_MODE_HIGHLIGHT_TOP_RIGHT" file="common/developer_mode_highlight_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_DOWN_ARROW" file="common/down_arrow.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOADS_FAVICON" file="common/favicon_downloads.png" /> - <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="download_animation_begin.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_ANIMATION_BEGIN" file="common/download_animation_begin.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM" file="common/download_button_center_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_H" file="common/download_button_center_bottom_hover.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_CENTER_BOTTOM_P" file="common/download_button_center_bottom_pressed.png" /> @@ -216,69 +226,82 @@ <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_H" file="common/download_button_right_top_hover.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_NO_DD" file="common/download_button_right_top_no_dd.png" /> <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_BUTTON_RIGHT_TOP_P" file="common/download_button_right_top_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="download_progress_background16.png" /> - <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="download_progress_background32.png" /> - <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="download_progress_foreground16.png" /> - <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="download_progress_foreground32.png" /> - <if expr="is_android"> - <structure type="chrome_scaled_image" name="IDR_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_ICON" file="infobar_protected_media_identifier.png" /> - </if> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_ENROLL_FAILURE" file="enroll_failure.png" /> - <structure type="chrome_scaled_image" name="IDR_ENROLL_SUCCESS" file="enroll_success.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_16" file="common/download_progress_background16.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_BACKGROUND_32" file="common/download_progress_background32.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_16" file="common/download_progress_foreground16.png" /> + <structure type="chrome_scaled_image" name="IDR_DOWNLOAD_PROGRESS_FOREGROUND_32" file="common/download_progress_foreground32.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_ENROLL_FAILURE" file="cros/enroll_failure.png" /> + <structure type="chrome_scaled_image" name="IDR_ENROLL_SUCCESS" file="cros/enroll_success.png" /> </if> <structure type="chrome_scaled_image" name="IDR_ERROR_NETWORK_GENERIC" file="common/error_network_generic.png" /> <structure type="chrome_scaled_image" name="IDR_ERROR_NETWORK_OFFLINE" file="common/error_network_offline.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_FAVICON" file="common/favicon_extensions.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SCRIPT_BUBBLE" file="common/script_bubble.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_PUZZLE_PIECE" file="common/exstension-features_28.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_LEFT" file="extensions_rating_star_half_left.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_RIGHT" file="extensions_rating_star_half_right.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_OFF" file="extensions_rating_star_off.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_ON" file="extensions_rating_star_on.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SECTION" file="extensions_section.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SECTION_SMALL" file="extensions_section_small.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSION_COMMAND_CLOSE" file="extension_command_close.png" /> - <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON" file="extension_default_icon.png" /> - <if expr="pp_ifdef('chromeos')"> + <if expr="enable_extensions"> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_FAVICON" file="common/favicon_extensions.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_LEFT" file="common/extensions_rating_star_half_left.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_HALF_RIGHT" file="common/extensions_rating_star_half_right.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_OFF" file="common/extensions_rating_star_off.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_RATING_STAR_ON" file="common/extensions_rating_star_on.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSIONS_SECTION" file="common/extensions_section.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSION_COMMAND_CLOSE" file="common/extension_command_close.png" /> + <structure type="chrome_scaled_image" name="IDR_EXTENSION_DEFAULT_ICON" file="common/extension_default_icon.png" /> + </if> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_FATAL_ERROR" file="cros/fatal_error.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_FEEDBACK" file="feedback.png" /> - <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback_pressed.png" /> - - <if expr="pp_ifdef('file_manager_extension')"> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE" file="cros/file_types/archive.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="cros/file_types/audio.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_CHART" file="cros/file_types/chart.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE" file="cros/file_types/drive.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_EXCEL" file="cros/file_types/excel.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_FOLDER" file="cros/file_types/folder.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_FORM" file="cros/file_types/form.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GDOC" file="cros/file_types/gdoc.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GDRAW" file="cros/file_types/gdraw.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GENERIC" file="cros/file_types/generic.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GLINK" file="cros/file_types/glink.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GSHEET" file="cros/file_types/gsheet.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GSLIDES" file="cros/file_types/gslides.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_GTABLE" file="cros/file_types/gtable.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_IMAGE" file="cros/file_types/image.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_PDF" file="cros/file_types/pdf.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_PPT" file="cros/file_types/ppt.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_SCRIPT" file="cros/file_types/script.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_SITES" file="cros/file_types/sites.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_VIDEO" file="cros/file_types/video.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_WORD" file="cros/file_types/word.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_AUDIO" file="cros/file_types/thumbnails/audio.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_FOLDER" file="cros/file_types/thumbnails/folder.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_IMAGE" file="cros/file_types/thumbnails/image.png" /> - <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_LARGE_VIDEO" file="cros/file_types/thumbnails/video.png" /> + <structure type="chrome_scaled_image" name="IDR_FILE_FOLDER" file="common/folder.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_ARCHIVE" file="cros/file_types/archive.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_ARCHIVE_WHITE" file="cros/file_types/archive_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_AUDIO" file="cros/file_types/audio.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_AUDIO_WHITE" file="cros/file_types/audio_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_DRIVE" file="cros/file_types/drive.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_EXCEL" file="cros/file_types/excel.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_EXCEL_WHITE" file="cros/file_types/excel_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER" file="cros/file_types/folder.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER_WHITE" file="cros/file_types/folder_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER_SHARED" file="cros/file_types/folder_shared.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FOLDER_SHARED_WHITE" file="cros/file_types/folder_shared_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FORM" file="cros/file_types/form.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_FORM_WHITE" file="cros/file_types/form_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDOC" file="cros/file_types/gdoc.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDOC_WHITE" file="cros/file_types/gdoc_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDRAW" file="cros/file_types/gdraw.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GDRAW_WHITE" file="cros/file_types/gdraw_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GENERIC" file="cros/file_types/generic.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GENERIC_WHITE" file="cros/file_types/generic_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GLINK" file="cros/file_types/glink.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GLINK_WHITE" file="cros/file_types/glink_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSHEET" file="cros/file_types/gsheet.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSHEET_WHITE" file="cros/file_types/gsheet_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSLIDES" file="cros/file_types/gslides.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GSLIDES_WHITE" file="cros/file_types/gslides_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GTABLE" file="cros/file_types/gtable.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_GTABLE_WHITE" file="cros/file_types/gtable_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_IMAGE" file="cros/file_types/image.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_IMAGE_WHITE" file="cros/file_types/image_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_PDF" file="cros/file_types/pdf.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_PDF_WHITE" file="cros/file_types/pdf_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_PPT" file="cros/file_types/ppt.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_PPT_WHITE" file="cros/file_types/ppt_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_SCRIPT" file="cros/file_types/script.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_SCRIPT_WHITE" file="cros/file_types/script_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_SITES" file="cros/file_types/sites.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_SITES_WHITE" file="cros/file_types/sites_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_VIDEO" file="cros/file_types/video.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_VIDEO_WHITE" file="cros/file_types/video_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_WORD" file="cros/file_types/word.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_WORD_WHITE" file="cros/file_types/word_white.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_AUDIO" file="cros/file_types/thumbnails/audio.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_FOLDER" file="cros/file_types/thumbnails/folder.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_FOLDER_SHARED" file="cros/file_types/thumbnails/folder_shared.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_GENERIC" file="cros/file_types/thumbnails/generic.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_IMAGE" file="cros/file_types/thumbnails/image.png" /> + <structure type="chrome_scaled_image" name="IDR_FILETYPE_LARGE_VIDEO" file="cros/file_types/thumbnails/video.png" /> </if> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_FILES_APP_ICON" file="common/files_app_icon.png" /> - <if expr="pp_ifdef('_google_chrome')"> + <if expr="chromeos"> + <if expr="_google_chrome"> <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_GREETING" file="google_chrome/cros/first_run_greeting.png" /> </if> <structure type="chrome_scaled_image" name="IDR_FIRST_RUN_COMPLETION" file="cros/first_run_completion.png" /> @@ -291,127 +314,132 @@ <structure type="chrome_scaled_image" name="IDR_FINDINPAGE_PREV_D" file="common/find_prev_disabled.png" /> <structure type="chrome_scaled_image" name="IDR_FINDINPAGE_PREV_H" file="common/find_prev_hover.png" /> <structure type="chrome_scaled_image" name="IDR_FINDINPAGE_PREV_P" file="common/find_prev_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_FIND_BOX_BACKGROUND" file="common/find_box_bg.png" /> - <structure type="chrome_scaled_image" name="IDR_FIND_BOX_BACKGROUND_LEFT" file="common/find_box_bg_left.png" /> <structure type="chrome_scaled_image" name="IDR_FIND_DIALOG_LEFT" file="common/find_dialog_left.png" /> <structure type="chrome_scaled_image" name="IDR_FIND_DIALOG_MIDDLE" file="common/find_dialog_middle.png" /> <structure type="chrome_scaled_image" name="IDR_FIND_DIALOG_RIGHT" file="common/find_dialog_right.png" /> <structure type="chrome_scaled_image" name="IDR_FIND_DLG_LEFT_BACKGROUND" file="common/find_dlg_left_bg.png" /> - <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 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 or is_ios"> + <if expr="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" /> <structure type="chrome_scaled_image" name="IDR_FORWARD_P" file="common/browser_forward_pressed.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" /> - <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" file="fullscreen_menu_button.png" /> - <structure type="chrome_scaled_image" name="IDR_GEOLOCATION_INFOBAR_ICON" file="infobar_geolocation.png" /> + <structure type="chrome_scaled_image" name="IDR_FROZEN_TAB_ICON" file="common/frozen_tab.png" /> + <structure type="chrome_scaled_image" name="IDR_FULLSCREEN_MENU_BUTTON" file="common/fullscreen_menu_button.png" /> <structure type="chrome_scaled_image" name="IDR_HELP_MENU" file="common/help_16.png" /> <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 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 or is_ios"> + <if expr="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 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 or is_ios"> + <if expr="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 is_ios"> <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ADD_USER" file="common/icon_add_user.png" /> - <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ADD_USER_WHITE" file="common/icon_add_user_white.png" /> <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_BROWSE_GUEST" file="common/icon_browse_as_guest.png" /> - <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_BROWSE_GUEST_WHITE" file="common/icon_browse_as_guest_white.png" /> <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_LOCKED" file="common/icon_locked.png" /> - </if> - <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="common/login_guest.png" /> - </if> - <if expr="pp_ifdef('chromeos')"> - <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" /> - <structure type="chrome_scaled_image" name="IDR_ICON_POWER24" file="icon_power24.png" /> - <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="icon_power_white.png" /> - </if> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_OFF" file="incognito_switch_off.png" /> - <structure type="chrome_scaled_image" name="IDR_INCOGNITO_SWITCH_ON" file="incognito_switch_on.png" /> - </if> - <structure type="chrome_scaled_image" name="IDR_INFO" file="info_small.png" /> - <if expr="pp_ifdef('toolkit_views')"> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM" file="infobarbutton_bottom_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM_LEFT" file="infobarbutton_bottom_left_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM_RIGHT" file="infobarbutton_bottom_right_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENTER" file="infobarbutton_center_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_LEFT" file="infobarbutton_left_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_RIGHT" file="infobarbutton_right_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP" file="infobarbutton_top_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_LEFT" file="infobarbutton_top_left_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_RIGHT" file="infobarbutton_top_right_hover.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="infobarbutton_menu_droparrow.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM" file="infobarbutton_bottom_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM_LEFT" file="infobarbutton_bottom_left_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM_RIGHT" file="infobarbutton_bottom_right_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_CENTER" file="infobarbutton_center_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_LEFT" file="infobarbutton_left_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_RIGHT" file="infobarbutton_right_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP" file="infobarbutton_top_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP_LEFT" file="infobarbutton_top_left_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP_RIGHT" file="infobarbutton_top_right_normal.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM" file="infobarbutton_bottom_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM_LEFT" file="infobarbutton_bottom_left_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM_RIGHT" file="infobarbutton_bottom_right_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_CENTER" file="infobarbutton_center_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_LEFT" file="infobarbutton_left_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_RIGHT" file="infobarbutton_right_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP" file="infobarbutton_top_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP_LEFT" file="infobarbutton_top_left_pressed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP_RIGHT" file="infobarbutton_top_right_pressed.png" /> - </if> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_ALT_NAV_URL" file="infobar_didyoumean.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL" file="infobar_autofill.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="infobar_desktop_notifications.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="common/infobar_camera.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI_SYSEX" file="common/infobar_midi.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_microphone.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" file="infobar_restore.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" file="infobar_savepassword.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="infobar_theme.png" /> - <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="infobar_translate.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_SUPERVISED" file="common/icon_supervised.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_LOCK" file="common/avatar_menu_lock.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_AVATAR" file="common/avatar_menu_profile.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_SUPERVISED" file="common/avatar_menu_supervised.png" /> + <structure type="chrome_scaled_image" + name="IDR_ICON_PROFILES_EDIT_HOVER" file="common/edit_button_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_PRESSED" file="common/edit_button_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_CARET" file="common/carrot_blue.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_EDIT_CAMERA" file="common/edit_camera.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUESTION_STABLE" file="common/profile_menu_question_stable.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUESTION_HOVER" file="common/profile_menu_question_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_MENU_QUESTION_SELECT" file="common/profile_menu_question_select.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_AVATAR_BUTTON_ERROR" file="common/avatar_button_auth_error.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_PROFILES_ACCOUNT_BUTTON_ERROR" file="common/avatar_menu_auth_error.png" /> + </if> + <if expr="not is_android and not is_ios and not chromeos"> + <!-- User Manager tutorial --> + <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_WELCOME" file="common/user_manager_tutorial/welcome.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_YOUR_CHROME" file="common/user_manager_tutorial/your_chrome.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_GUESTS" file="common/user_manager_tutorial/guests.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_FRIENDS" file="common/user_manager_tutorial/family_and_friends.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_USER_MANAGER_TUTORIAL_COMPLETE" file="common/user_manager_tutorial/complete.png" /> + </if> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_ICON_ADD_USER_WHITE" file="cros/icon_add_user_white.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_GUEST_WHITE" file="cros/icon_guest_white.png" /> + <structure type="chrome_scaled_image" name="IDR_ICON_POWER_WHITE" file="cros/icon_power_white.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_INFO" file="common/info_small.png" /> + <if expr="toolkit_views"> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM" file="common/infobarbutton_bottom_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM_LEFT" file="common/infobarbutton_bottom_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_BOTTOM_RIGHT" file="common/infobarbutton_bottom_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_CENTER" file="common/infobarbutton_center_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_LEFT" file="common/infobarbutton_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_RIGHT" file="common/infobarbutton_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP" file="common/infobarbutton_top_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_LEFT" file="common/infobarbutton_top_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_HOVER_TOP_RIGHT" file="common/infobarbutton_top_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_MENU_DROPARROW" file="common/infobarbutton_menu_droparrow.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM" file="common/infobarbutton_bottom_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM_LEFT" file="common/infobarbutton_bottom_left_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_BOTTOM_RIGHT" file="common/infobarbutton_bottom_right_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_CENTER" file="common/infobarbutton_center_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_LEFT" file="common/infobarbutton_left_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_RIGHT" file="common/infobarbutton_right_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP" file="common/infobarbutton_top_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP_LEFT" file="common/infobarbutton_top_left_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_NORMAL_TOP_RIGHT" file="common/infobarbutton_top_right_normal.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM" file="common/infobarbutton_bottom_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM_LEFT" file="common/infobarbutton_bottom_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_BOTTOM_RIGHT" file="common/infobarbutton_bottom_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_CENTER" file="common/infobarbutton_center_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_LEFT" file="common/infobarbutton_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_RIGHT" file="common/infobarbutton_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP" file="common/infobarbutton_top_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP_LEFT" file="common/infobarbutton_top_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBARBUTTON_PRESSED_TOP_RIGHT" file="common/infobarbutton_top_right_pressed.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_3D_BLOCKED" file="common/infobar_3d_blocked.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_ALT_NAV_URL" file="common/infobar_alt_nav_url.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="common/infobar_autofill_cc.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOLOGIN" file="common/infobar_autologin.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="common/infobar_cookie.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="common/infobar_desktop_notifications.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_GEOLOCATION" file="common/infobar_geolocation.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="common/infobar_media_stream_camera.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="common/infobar_media_stream_mic.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MIDI" file="common/infobar_midi.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="common/infobar_multiple_downloads.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" file="common/infobar_plugin_crashed.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" file="common/infobar_plugin_install.png" /> + <if expr="is_android"> + <!-- The actual image here is not used; this line only exists to + reserve a valid ID, so the Android code can map it to the + appropriate Android resource. So we just refer to a random + image. --> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_PROTECTED_MEDIA_IDENTIFIER" file="common/app_default_icon.png" /> + </if> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_RESTORE_SESSION" file="common/infobar_restore_session.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" file="common/infobar_save_password.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="common/infobar_theme.png" /> + <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="common/infobar_translate.png" /> <structure type="chrome_scaled_image" name="IDR_INFOBAR_WARNING" file="common/infobar_warning.png" /> <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT" file="common/input_alert.png" /> <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT_MENU" file="common/input_alert_menu.png" /> <structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="common/input_good.png" /> - <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" /> - <structure type="chrome_scaled_image" name="IDR_KILLED_TAB" file="killtab.png" /> + <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="common/keyword_search_magnifier.png" /> + <structure type="chrome_scaled_image" name="IDR_KILLED_TAB" file="common/killtab.png" /> <structure type="chrome_scaled_image" name="IDR_LAPTOP_FAVICON" file="common/favicon_laptop.png" /> - <if expr="pp_ifdef('enable_mdns')"> + <if expr="enable_service_discovery"> <structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRINT_ICON" file="common/cloudprint.png" /> </if> + <!-- TODO(calamity): The 1x local ntp resources require a proper version. + See crbug.com/363519. --> + <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" /> + <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_WHITE_LOGO_PNG" file="common/ntp_white_google_logo.png" /> <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="common/location_bar_http.png" /> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <!-- TODO(nkostylev): This resource needs to be removed when cros login code is moved to ash. --> <structure type="chrome_scaled_image" name="IDR_LAUNCHER_BACKGROUND" file="cros/launcher_background.png" /> <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER" file="avatar_beaker.png" /> @@ -447,12 +475,10 @@ <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_30" file="avatar_rainbowfish.png" /> <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_31" file="avatar_recordplayer.png" /> <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_32" file="avatar_upsidedown.png" /> - <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK" file="login_password_capslock.png" /> + <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK" file="cros/login_password_capslock.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_LOGIN_GUEST" file="common/login_guest.png" /> - <structure type="chrome_scaled_image" name="IDR_MANAGED" file="managed_small.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_MANAGED_MODE_ICON" file="cros/managed_mode_icon.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_KIOSK_APP_USER_POD_ICON" file="cros/kiosk_app_user_pod_icon.png" /> </if> <structure type="chrome_scaled_image" name="IDR_MANAGED_USER_ICON" file="common/limited_user.png" /> <structure type="chrome_scaled_image" name="IDR_MANAGED_USER_LABEL_BOTTOM" file="common/managed_user_theme/label_bg_bottom.png" /> @@ -467,47 +493,40 @@ <structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME" file="common/managed_user_theme/theme_frame_supervised.png" /> <structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_FRAME_INACTIVE" file="common/managed_user_theme/theme_frame_supervised_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_MANAGED_USER_THEME_TAB_BACKGROUND" file="common/managed_user_theme/theme_tab_background_supervised.png" /> - <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" /> - <structure type="chrome_scaled_image" name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_MIRROR_FLIP" file="mirror_flip.png" /> + <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_BUTTON_MASK" file="common/maximize_button_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_MINIMIZE_BUTTON_MASK" file="common/minimize_button_mask.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_MIRROR_FLIP" file="cros/mirror_flip.png" /> </if> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_NETWORK_ADD_CONNECTION" file="cros/network_add_connection.png" /> <structure type="chrome_scaled_image" name="IDR_NETWORK_HIDE_PASSWORD" file="cros/network_hide_password.png" /> <structure type="chrome_scaled_image" name="IDR_NETWORK_HIDE_PASSWORD_HOVER" file="cros/network_hide_password_hover.png" /> <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 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 or is_ios"> + <if expr="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" /> <structure type="chrome_scaled_image" name="IDR_NEWTAB_BUTTON_P" file="common/newtab_pressed.png" /> </if> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="cros/ntp_welcome_thumb.png" /> </if> - <if expr="not pp_ifdef('chromeos')"> + <if expr="not chromeos"> <structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="common/ntp_welcome_thumb.png" /> </if> <structure type="chrome_scaled_image" name="IDR_NEWTAB_WEBSTORE_THUMBNAIL" file="ntp_webstore_thumb.png" /> - <if expr="pp_ifdef('use_ash')"> + <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ALERT" file="common/notification_alert.png" /> </if> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DRIVE" file="cros/notification_drive.png" /> - </if> - <if expr="pp_ifdef('chromeos')"> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_PERIPHERAL_BATTERY_LOW" file="cros/notification_peripheral_battery_low.png" /> + <structure type="chrome_scaled_image" name="IDR_PORTAL_DETECTION_ALERT" file="cros/captive_portal_icon.png" /> </if> - <if expr="is_win or is_linux"> + <if expr="is_win or desktop_linux"> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_ATTENTION" file="common/notification_tray_do_not_disturb_attention.png" /> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_EMPTY" file="common/notification_tray_do_not_disturb_empty.png" /> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_ATTENTION" file="common/notification_tray_attention.png" /> @@ -515,15 +534,7 @@ </if> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_ICON" file="common/notification_welcome_icon.png" /> <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_LEARN_MORE" file="common/notification_welcome_learn_more.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_BOTTOM" file="common/omnibox_border_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_BOTTOM_LEFT" file="common/omnibox_border_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_BOTTOM_RIGHT" file="common/omnibox_border_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_CENTER" file="common/omnibox_border_center.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_LEFT" file="common/omnibox_border_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_RIGHT" file="common/omnibox_border_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_TOP" file="common/omnibox_border_top.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_TOP_LEFT" file="common/omnibox_border_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER_TOP_RIGHT" file="common/omnibox_border_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_NOTIFIER_BLOCK_BUTTON" file="common/block_notifier.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_BOTTOM" file="common/omnibox_content_setting_bubble_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_BOTTOM_LEFT" file="common/omnibox_content_setting_bubble_bottom_left.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_BOTTOM_RIGHT" file="common/omnibox_content_setting_bubble_bottom_right.png" /> @@ -545,18 +556,9 @@ <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP" file="common/omnibox_extension_app.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP_DARK" file="common/omnibox_extension_app_dark.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_EXTENSION_APP_SELECTED" file="common/omnibox_extension_app_selected.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_BOTTOM" file="common/omnibox_filling_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_BOTTOM_LEFT" file="common/omnibox_filling_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_BOTTOM_RIGHT" file="common/omnibox_filling_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_LEFT" file="common/omnibox_filling_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_CENTER" file="common/omnibox_filling_center.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_RIGHT" file="common/omnibox_filling_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_TOP" file="common/omnibox_filling_top.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_TOP_LEFT" file="common/omnibox_filling_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_FILLING_TOP_RIGHT" file="common/omnibox_filling_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTP" file="common/omnibox_http.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_INVALID" file="common/omnibox_https_invalid.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_POLICY_WARNING" file="common/omnibox_https_policy_warning.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_POLICY_WARNING" file="common/controlled_setting_mandatory.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_HTTPS_VALID" file="common/omnibox_https_valid.png" /> <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" /> @@ -569,15 +571,15 @@ </if> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_MIC_SEARCH" file="common/omnibox_mic_search.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_PDF_ICON" file="pdf.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_BOTTOM" file="common/omnibox_popup_border_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_BOTTOM_LEFT" file="common/omnibox_popup_border_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_BOTTOM_RIGHT" file="common/omnibox_popup_border_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_CENTER" file="common/omnibox_popup_border_center.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_LEFT" file="common/omnibox_popup_border_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_RIGHT" file="common/omnibox_popup_border_right.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_TOP" file="common/omnibox_popup_border_top.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_TOP_LEFT" file="common/omnibox_popup_border_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_TOP_RIGHT" file="common/omnibox_popup_border_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM" file="common/omnibox_popup_border_and_shadow_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM_LEFT" file="common/omnibox_popup_border_and_shadow_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_BOTTOM_RIGHT" file="common/omnibox_popup_border_and_shadow_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_CENTER" file="common/omnibox_popup_border_and_shadow_center.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_LEFT" file="common/omnibox_popup_border_and_shadow_left.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_RIGHT" file="common/omnibox_popup_border_and_shadow_right.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP" file="common/omnibox_popup_border_and_shadow_top.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_LEFT" file="common/omnibox_popup_border_and_shadow_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW_TOP_RIGHT" file="common/omnibox_popup_border_and_shadow_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH" file="common/omnibox_search.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM" file="common/omnibox_search_button_bottom_middle.png" /> <structure type="chrome_scaled_image" name="IDR_OMNIBOX_SEARCH_BUTTON_BOTTOM_LEFT" file="common/omnibox_search_button_bottom_left.png" /> @@ -626,35 +628,26 @@ <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 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')"> - <if expr="not pp_ifdef('use_ash')"> + <if expr="toolkit_views"> + <if expr="not use_ash"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/otr_icon.png" /> </if> - <if expr="pp_ifdef('use_ash')"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="cros/otr_icon.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON_WIN" file="common/otr_icon.png" /> + <if expr="use_ash"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="common/ash/otr_icon.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_OTR_ICON_DESKTOP" file="common/otr_icon.png" /> </if> </if> </if> - <if expr="is_macosx or is_ios"> + <if expr="(is_macosx or is_ios) and not toolkit_views"> <structure type="chrome_scaled_image" name="IDR_OTR_ICON" file="mac/otr_icon.png" /> </if> - <if expr="context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="common/otr_icon.png" /> - </if> - <if expr="not context.startswith('default_')"> - <structure type="chrome_scaled_image" name="IDR_OTR_ICON_FULLSCREEN" file="otr_icon_fullscreen.png" /> - </if> <structure type="chrome_scaled_image" name="IDR_OVERLAY_DROP_SHADOW" file="common/overlay_drop_shadow.png" /> - <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" /> - <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="pageinfo_good.png" /> - <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="pageinfo_info.png" /> - <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MAJOR" file="pageinfo_warning_major.png" /> - <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MINOR" file="pageinfo_warning_minor.png" /> + <structure type="chrome_scaled_image" name="IDR_PAGEINFO_BAD" file="common/pageinfo_bad.png" /> + <structure type="chrome_scaled_image" name="IDR_PAGEINFO_GOOD" file="common/pageinfo_good.png" /> + <structure type="chrome_scaled_image" name="IDR_PAGEINFO_INFO" file="common/pageinfo_info.png" /> + <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MAJOR" file="common/pageinfo_warning_major.png" /> + <structure type="chrome_scaled_image" name="IDR_PAGEINFO_WARNING_MINOR" file="common/pageinfo_warning_minor.png" /> <structure type="chrome_scaled_image" name="IDR_PAGEINFO_ENTERPRISE_MANAGED" file="common/pageinfo_enterprise_managed.png" /> <structure type="chrome_scaled_image" name="IDR_PANEL_CLOSE" file="panel_close.png" /> <structure type="chrome_scaled_image" name="IDR_PANEL_CLOSE_C" file="panel_close_click.png" /> @@ -667,8 +660,8 @@ <structure type="chrome_scaled_image" name="IDR_PANEL_RESTORE_H" file="panel_restore_hover.png" /> <structure type="chrome_scaled_image" name="IDR_PHONE_FAVICON" file="common/favicon_phone.png" /> <structure type="chrome_scaled_image" name="IDR_PLUGINS_FAVICON" file="common/favicon_extensions.png" /> - <structure type="chrome_scaled_image" name="IDR_PRERENDER" file="prerender_succeed_icon.png" /> - <if expr="not pp_ifdef('_google_chrome')"> + <structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" /> + <if expr="not _google_chrome"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="chromium/product_logo.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="chromium/product_logo_26.png" /> @@ -676,7 +669,7 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_48" file="chromium/product_logo_name_48.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file="chromium/product_logo_white.png" /> </if> - <if expr="pp_ifdef('_google_chrome')"> + <if expr="_google_chrome"> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO" file="google_chrome/product_logo.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_26" file="google_chrome/product_logo_26.png" /> @@ -685,187 +678,235 @@ <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_WHITE" file="google_chrome/product_logo_white.png" /> </if> <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" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="profile_avatar_generic_green_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="profile_avatar_generic_orange_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="profile_avatar_generic_purple_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="profile_avatar_generic_red_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="profile_avatar_generic_yellow_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="profile_avatar_secret_agent_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="profile_avatar_superhero_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="profile_avatar_volley_ball_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="profile_avatar_businessman_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="profile_avatar_ninja_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="profile_avatar_alien_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="profile_avatar_awesome_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="profile_avatar_flower_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse_mac.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita_mac.png" /> - <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" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="common/profile_avatar_generic_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="common/profile_avatar_generic_aqua_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="common/profile_avatar_generic_blue_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="common/profile_avatar_generic_green_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="common/profile_avatar_generic_orange_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="common/profile_avatar_generic_purple_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="common/profile_avatar_generic_red_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="common/profile_avatar_generic_yellow_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="common/profile_avatar_secret_agent_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="common/profile_avatar_superhero_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="common/profile_avatar_volley_ball_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="common/profile_avatar_businessman_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="common/profile_avatar_ninja_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="common/profile_avatar_alien_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="common/profile_avatar_awesome_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="common/profile_avatar_flower_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="common/profile_avatar_pizza_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="common/profile_avatar_soccer_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="common/profile_avatar_burger_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="common/profile_avatar_cat_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="common/profile_avatar_cupcake_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="common/profile_avatar_dog_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="common/profile_avatar_horse_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="common/profile_avatar_margarita_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="common/profile_avatar_note_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="common/profile_avatar_sun_cloud_mac.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_26" file="common/login_guest.png" /> </if> <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" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="profile_avatar_generic_green.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="profile_avatar_generic_orange.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="profile_avatar_generic_purple.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="profile_avatar_generic_red.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="profile_avatar_generic_yellow.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="profile_avatar_secret_agent.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="profile_avatar_superhero.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="profile_avatar_volley_ball.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="profile_avatar_businessman.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="profile_avatar_ninja.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="profile_avatar_alien.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="profile_avatar_awesome.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="profile_avatar_flower.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note.png" /> - <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_0" file="common/profile_avatar_generic.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_1" file="common/profile_avatar_generic_aqua.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_2" file="common/profile_avatar_generic_blue.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_3" file="common/profile_avatar_generic_green.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_4" file="common/profile_avatar_generic_orange.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_5" file="common/profile_avatar_generic_purple.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_6" file="common/profile_avatar_generic_red.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_7" file="common/profile_avatar_generic_yellow.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_8" file="common/profile_avatar_secret_agent.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_9" file="common/profile_avatar_superhero.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_10" file="common/profile_avatar_volley_ball.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_11" file="common/profile_avatar_businessman.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_12" file="common/profile_avatar_ninja.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_13" file="common/profile_avatar_alien.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_14" file="common/profile_avatar_awesome.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_15" file="common/profile_avatar_flower.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_16" file="common/profile_avatar_pizza.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_17" file="common/profile_avatar_soccer.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_18" file="common/profile_avatar_burger.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_19" file="common/profile_avatar_cat.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_20" file="common/profile_avatar_cupcake.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_21" file="common/profile_avatar_dog.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_22" file="common/profile_avatar_horse.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_23" file="common/profile_avatar_margarita.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_24" file="common/profile_avatar_note.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_25" file="common/profile_avatar_sun_cloud.png" /> + <structure type="chrome_scaled_image" name="IDR_PROFILE_AVATAR_26" file="common/login_guest.png" /> </if> <!-- New style avatar button --> - <!-- Windows, themed --> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_DROPARROW" file="win/avatar_button/themed/sign_in_button_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/themed/sign_in_button_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_CENTER" file="win/avatar_button/themed/sign_in_button_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_LEFT" file="win/avatar_button/themed/sign_in_button_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_RIGHT" file="win/avatar_button/themed/sign_in_button_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP" file="win/avatar_button/themed/sign_in_button_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM" file="win/avatar_button/themed/sign_in_button_hover_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_hover_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_CENTER" file="win/avatar_button/themed/sign_in_button_hover_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_LEFT" file="win/avatar_button/themed/sign_in_button_hover_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP" file="win/avatar_button/themed/sign_in_button_hover_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_hover_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/themed/sign_in_button_pressed_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_CENTER" file="win/avatar_button/themed/sign_in_button_pressed_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP" file="win/avatar_button/themed/sign_in_button_pressed_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_top_right.png" /> + <if expr="toolkit_views"> + <!-- Windows, themed --> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_DROPARROW" file="win/avatar_button/themed/sign_in_button_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/themed/sign_in_button_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_CENTER" file="win/avatar_button/themed/sign_in_button_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_LEFT" file="win/avatar_button/themed/sign_in_button_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_RIGHT" file="win/avatar_button/themed/sign_in_button_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP" file="win/avatar_button/themed/sign_in_button_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM" file="win/avatar_button/themed/sign_in_button_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_CENTER" file="win/avatar_button/themed/sign_in_button_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_LEFT" file="win/avatar_button/themed/sign_in_button_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP" file="win/avatar_button/themed/sign_in_button_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_hover_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/themed/sign_in_button_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_CENTER" file="win/avatar_button/themed/sign_in_button_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP" file="win/avatar_button/themed/sign_in_button_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/themed/sign_in_button_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/themed/sign_in_button_pressed_top_right.png" /> + + <!-- Windows, Aero --> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_DROPARROW" file="win/avatar_button/win7/sign_in_button_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/win7/sign_in_button_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_CENTER" file="win/avatar_button/win7/sign_in_button_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_LEFT" file="win/avatar_button/win7/sign_in_button_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_RIGHT" file="win/avatar_button/win7/sign_in_button_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP" file="win/avatar_button/win7/sign_in_button_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM" file="win/avatar_button/win7/sign_in_button_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_CENTER" file="win/avatar_button/win7/sign_in_button_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_LEFT" file="win/avatar_button/win7/sign_in_button_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP" file="win/avatar_button/win7/sign_in_button_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/win7/sign_in_button_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_CENTER" file="win/avatar_button/win7/sign_in_button_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP" file="win/avatar_button/win7/sign_in_button_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_top_right.png" /> - <!-- Windows, Aero --> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_DROPARROW" file="win/avatar_button/win7/sign_in_button_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/win7/sign_in_button_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_CENTER" file="win/avatar_button/win7/sign_in_button_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_LEFT" file="win/avatar_button/win7/sign_in_button_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_RIGHT" file="win/avatar_button/win7/sign_in_button_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP" file="win/avatar_button/win7/sign_in_button_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM" file="win/avatar_button/win7/sign_in_button_hover_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_hover_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_CENTER" file="win/avatar_button/win7/sign_in_button_hover_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_LEFT" file="win/avatar_button/win7/sign_in_button_hover_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP" file="win/avatar_button/win7/sign_in_button_hover_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_hover_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_hover_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/win7/sign_in_button_pressed_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_CENTER" file="win/avatar_button/win7/sign_in_button_pressed_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP" file="win/avatar_button/win7/sign_in_button_pressed_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/win7/sign_in_button_pressed_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_GLASS_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/win7/sign_in_button_pressed_top_right.png" /> + <!-- Windows, metro --> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_DROPARROW" file="win/avatar_button/win8/sign_in_button_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/win8/sign_in_button_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_CENTER" file="win/avatar_button/win8/sign_in_button_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_LEFT" file="win/avatar_button/win8/sign_in_button_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_RIGHT" file="win/avatar_button/win8/sign_in_button_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP" file="win/avatar_button/win8/sign_in_button_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM" file="win/avatar_button/win8/sign_in_button_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_CENTER" file="win/avatar_button/win8/sign_in_button_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_LEFT" file="win/avatar_button/win8/sign_in_button_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP" file="win/avatar_button/win8/sign_in_button_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/win8/sign_in_button_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_CENTER" file="win/avatar_button/win8/sign_in_button_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP" file="win/avatar_button/win8/sign_in_button_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_top_right.png" /> + </if> <!-- toolkit_views --> + <if expr="is_macosx"> + <!-- Mac --> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW" file="mac/avatar_button/sign_in_button_arrow.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW_HOVER" file="mac/avatar_button/sign_in_button_arrow_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_DROPARROW_PRESSED" file="mac/avatar_button/sign_in_button_arrow_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM" file="mac/avatar_button/sign_in_button_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM_LEFT" file="mac/avatar_button/sign_in_button_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_BOTTOM_RIGHT" file="mac/avatar_button/sign_in_button_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_CENTER" file="mac/avatar_button/sign_in_button_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_LEFT" file="mac/avatar_button/sign_in_button_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_RIGHT" file="mac/avatar_button/sign_in_button_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_TOP" file="mac/avatar_button/sign_in_button_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_TOP_LEFT" file="mac/avatar_button/sign_in_button_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_NORMAL_TOP_RIGHT" file="mac/avatar_button/sign_in_button_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_BOTTOM" file="mac/avatar_button/sign_in_button_bottom_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_BOTTOM_LEFT" file="mac/avatar_button/sign_in_button_bottom_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_BOTTOM_RIGHT" file="mac/avatar_button/sign_in_button_bottom_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_CENTER" file="mac/avatar_button/sign_in_button_center_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_LEFT" file="mac/avatar_button/sign_in_button_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_RIGHT" file="mac/avatar_button/sign_in_button_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_TOP" file="mac/avatar_button/sign_in_button_top_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_TOP_LEFT" file="mac/avatar_button/sign_in_button_top_left_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_HOVER_TOP_RIGHT" file="mac/avatar_button/sign_in_button_top_right_hover.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_BOTTOM" file="mac/avatar_button/sign_in_button_bottom_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_BOTTOM_LEFT" file="mac/avatar_button/sign_in_button_bottom_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_BOTTOM_RIGHT" file="mac/avatar_button/sign_in_button_bottom_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_CENTER" file="mac/avatar_button/sign_in_button_center_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_LEFT" file="mac/avatar_button/sign_in_button_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_RIGHT" file="mac/avatar_button/sign_in_button_right_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_TOP" file="mac/avatar_button/sign_in_button_top_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_TOP_LEFT" file="mac/avatar_button/sign_in_button_top_left_pressed.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_MAC_BUTTON_PRESSED_TOP_RIGHT" file="mac/avatar_button/sign_in_button_top_right_pressed.png" /> - <!-- Windows, metro --> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_DROPARROW" file="win/avatar_button/win8/sign_in_button_arrow.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM" file="win/avatar_button/win8/sign_in_button_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_CENTER" file="win/avatar_button/win8/sign_in_button_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_LEFT" file="win/avatar_button/win8/sign_in_button_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_RIGHT" file="win/avatar_button/win8/sign_in_button_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP" file="win/avatar_button/win8/sign_in_button_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_NORMAL_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM" file="win/avatar_button/win8/sign_in_button_hover_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_hover_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_CENTER" file="win/avatar_button/win8/sign_in_button_hover_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_LEFT" file="win/avatar_button/win8/sign_in_button_hover_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP" file="win/avatar_button/win8/sign_in_button_hover_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_hover_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_HOVER_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_hover_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM" file="win/avatar_button/win8/sign_in_button_pressed_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_BOTTOM_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_CENTER" file="win/avatar_button/win8/sign_in_button_pressed_center.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_right.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP" file="win/avatar_button/win8/sign_in_button_pressed_top.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP_LEFT" file="win/avatar_button/win8/sign_in_button_pressed_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_AVATAR_METRO_BUTTON_PRESSED_TOP_RIGHT" file="win/avatar_button/win8/sign_in_button_pressed_top_right.png" /> + <!-- Mac, themed --> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_BOTTOM" file="mac/avatar_button/sign_in_button_themed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_BOTTOM_LEFT" file="mac/avatar_button/sign_in_button_themed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_BOTTOM_RIGHT" file="mac/avatar_button/sign_in_button_themed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_CENTER" file="mac/avatar_button/sign_in_button_themed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_LEFT" file="mac/avatar_button/sign_in_button_themed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_RIGHT" file="mac/avatar_button/sign_in_button_themed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_TOP" file="mac/avatar_button/sign_in_button_themed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_TOP_LEFT" file="mac/avatar_button/sign_in_button_themed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_AVATAR_THEMED_MAC_BUTTON_NORMAL_TOP_RIGHT" file="mac/avatar_button/sign_in_button_themed_top_right.png" /> + </if> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="profile_loading.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_PROFILE_PICTURE_LOADING" file="cros/profile_loading.png" /> <structure type="chrome_scaled_image" name="IDR_RESET_WARNING" file="reset_warning.png" /> </if> <structure type="chrome_scaled_image" name="IDR_QUESTION_MARK" file="common/question_mark.png" /> <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 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 or is_ios"> + <if expr="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" /> <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/browser_reload_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="common/browser_reload_dimmed.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" /> + <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file="common/restore_button_mask.png" /> <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/favicon_sad_tab.png" /> - <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" /> - <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" /> + <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="common/sadtab.png" /> + <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file="common/safebrowsing_warning.png" /> + <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_ACTIVE" file="common/save_password_active.png" /> + <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_DISABLED_ACTIVE" file="common/save_password_disabled_active.png" /> + <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_DISABLED_INACTIVE" file="common/save_password_disabled_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_SAVE_PASSWORD_INACTIVE" file="common/save_password_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATION_GRIP" file="screen_capture_notification_grip.png" /> <structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_ICON" file="common/notification_screenshot_icon.png" /> - <structure type="chrome_scaled_image" name="IDR_SCRIPT_BUBBLE" file="common/favicon_extensions.png" /> - <if expr="pp_ifdef('enable_settings_app')"> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_SECONDARY_USER_SETTINGS" file="cros/secondary_user_settings.png" /> + </if> + <if expr="enable_settings_app"> <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" file="settings_app_icon_128.png" /> <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" file="settings_app_icon_16.png" /> <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_32" file="settings_app_icon_32.png" /> <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_48" file="settings_app_icon_48.png" /> </if> - <if expr="pp_ifdef('toolkit_views')"> + <if expr="toolkit_views"> <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTTOM_LEFT" file="common/chip_brokenssl_bottom_left.png" /> <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTTOM" file="common/chip_brokenssl_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTTOM_RIGHT" file="common/chip_brokenssl_bottom_right.png" /> @@ -894,85 +935,162 @@ <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_MALWARE_TOP_RIGHT" file="common/chip_malware_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_MALWARE_TOP" file="common/chip_malware_top.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="common/favicon_settings.png" /> - <if expr="pp_ifdef('toolkit_views')"> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_TOP_LEFT" file="common/toolbar_button_hover_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_TOP" file="common/toolbar_button_hover_top.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_TOP_RIGHT" file="common/toolbar_button_hover_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_LEFT" file="common/toolbar_button_hover_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_CENTER" file="common/toolbar_button_hover_center.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_RIGHT" file="common/toolbar_button_hover_right.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_BOTTOM_LEFT" file="common/toolbar_button_hover_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_BOTTOM" file="common/toolbar_button_hover_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_HOVER_BOTTOM_RIGHT" file="common/toolbar_button_hover_bottom_right.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_TOP_LEFT" file="common/toolbar_button_pressed_top_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_TOP" file="common/toolbar_button_pressed_top.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_TOP_RIGHT" file="common/toolbar_button_pressed_top_right.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_LEFT" file="common/toolbar_button_pressed_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_CENTER" file="common/toolbar_button_pressed_center.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_RIGHT" file="common/toolbar_button_pressed_right.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_BOTTOM_LEFT" file="common/toolbar_button_pressed_bottom_left.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_BOTTOM" file="common/toolbar_button_pressed_bottom.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLBAR_BUTTON_PRESSED_BOTTOM_RIGHT" file="common/toolbar_button_pressed_bottom_right.png" /> - </if> - <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_EMPTY" file="common/speech_input_mic_empty.png" /> - <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_FULL" file="common/speech_input_mic_full.png" /> - <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_MASK" file="common/speech_input_mic_mask.png" /> - <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_MIC_NOISE" file="common/speech_input_mic_noise.png" /> - <structure type="chrome_scaled_image" name="IDR_SPEECH_INPUT_SPINNER" file="common/speech_input_spinner.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_SPINNER" file="spinner.png" /> + <if expr="toolkit_views or is_macosx and not is_ios"> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_BOTTOM_LEFT" file="common/chip_normal_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_BOTTOM" file="common/chip_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_BOTTOM_RIGHT" file="common/chip_normal_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_LEFT" file="common/chip_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_CENTER" file="common/chip_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_RIGHT" file="common/chip_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_TOP_LEFT" file="common/chip_normal_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_TOP" file="common/chip_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_NORMAL_TOP_RIGHT" file="common/chip_normal_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_BOTTOM_LEFT" file="common/chip_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_BOTTOM" file="common/chip_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_BOTTOM_RIGHT" file="common/chip_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_LEFT" file="common/chip_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_CENTER" file="common/chip_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_RIGHT" file="common/chip_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_TOP_LEFT" file="common/chip_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_TOP" file="common/chip_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_PRESSED_TOP_RIGHT" file="common/chip_pressed_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_BOTTOM_LEFT" file="common/chip_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_BOTTOM" file="common/chip_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_BOTTOM_RIGHT" file="common/chip_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_LEFT" file="common/chip_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_CENTER" file="common/chip_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_RIGHT" file="common/chip_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_TOP_LEFT" file="common/chip_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_TOP" file="common/chip_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_HOVER_TOP_RIGHT" file="common/chip_hover_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_BOTTOM_LEFT" file="common/chip_brokenssl_normal_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_BOTTOM" file="common/chip_brokenssl_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_BOTTOM_RIGHT" file="common/chip_brokenssl_normal_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_LEFT" file="common/chip_brokenssl_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_CENTER" file="common/chip_brokenssl_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_RIGHT" file="common/chip_brokenssl_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_TOP_LEFT" file="common/chip_brokenssl_normal_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_TOP" file="common/chip_brokenssl_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_NORMAL_TOP_RIGHT" file="common/chip_brokenssl_normal_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_BOTTOM_LEFT" file="common/chip_brokenssl_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_BOTTOM" file="common/chip_brokenssl_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_BOTTOM_RIGHT" file="common/chip_brokenssl_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_LEFT" file="common/chip_brokenssl_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_CENTER" file="common/chip_brokenssl_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_RIGHT" file="common/chip_brokenssl_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_TOP_LEFT" file="common/chip_brokenssl_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_TOP" file="common/chip_brokenssl_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_PRESSED_TOP_RIGHT" file="common/chip_brokenssl_pressed_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_BOTTOM_LEFT" file="common/chip_brokenssl_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_BOTTOM" file="common/chip_brokenssl_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_BOTTOM_RIGHT" file="common/chip_brokenssl_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_LEFT" file="common/chip_brokenssl_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_CENTER" file="common/chip_brokenssl_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_RIGHT" file="common/chip_brokenssl_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_TOP_LEFT" file="common/chip_brokenssl_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_TOP" file="common/chip_brokenssl_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_BROKENSSL_HOVER_TOP_RIGHT" file="common/chip_brokenssl_hover_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_BOTTOM_LEFT" file="common/chip_extended_validation_normal_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_BOTTOM" file="common/chip_extended_validation_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_BOTTOM_RIGHT" file="common/chip_extended_validation_normal_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_LEFT" file="common/chip_extended_validation_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_CENTER" file="common/chip_extended_validation_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_RIGHT" file="common/chip_extended_validation_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_TOP_LEFT" file="common/chip_extended_validation_normal_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_TOP" file="common/chip_extended_validation_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_NORMAL_TOP_RIGHT" file="common/chip_extended_validation_normal_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_BOTTOM_LEFT" file="common/chip_extended_validation_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_BOTTOM" file="common/chip_extended_validation_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_BOTTOM_RIGHT" file="common/chip_extended_validation_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_LEFT" file="common/chip_extended_validation_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_CENTER" file="common/chip_extended_validation_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_RIGHT" file="common/chip_extended_validation_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_TOP_LEFT" file="common/chip_extended_validation_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_TOP" file="common/chip_extended_validation_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_PRESSED_TOP_RIGHT" file="common/chip_extended_validation_pressed_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_BOTTOM_LEFT" file="common/chip_extended_validation_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_BOTTOM" file="common/chip_extended_validation_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_BOTTOM_RIGHT" file="common/chip_extended_validation_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_LEFT" file="common/chip_extended_validation_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_CENTER" file="common/chip_extended_validation_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_RIGHT" file="common/chip_extended_validation_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_TOP_LEFT" file="common/chip_extended_validation_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_TOP" file="common/chip_extended_validation_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_EV_HOVER_TOP_RIGHT" file="common/chip_extended_validation_hover_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_BOTTOM_LEFT" file="common/chip_malware_normal_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_BOTTOM" file="common/chip_malware_normal_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_BOTTOM_RIGHT" file="common/chip_malware_normal_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_LEFT" file="common/chip_malware_normal_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_CENTER" file="common/chip_malware_normal_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_RIGHT" file="common/chip_malware_normal_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_TOP_LEFT" file="common/chip_malware_normal_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_TOP" file="common/chip_malware_normal_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_NORMAL_TOP_RIGHT" file="common/chip_malware_normal_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_BOTTOM_LEFT" file="common/chip_malware_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_BOTTOM" file="common/chip_malware_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_BOTTOM_RIGHT" file="common/chip_malware_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_LEFT" file="common/chip_malware_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_CENTER" file="common/chip_malware_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_RIGHT" file="common/chip_malware_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_TOP_LEFT" file="common/chip_malware_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_TOP" file="common/chip_malware_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_PRESSED_TOP_RIGHT" file="common/chip_malware_pressed_top_right.png" /> + + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_BOTTOM_LEFT" file="common/chip_malware_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_BOTTOM" file="common/chip_malware_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_BOTTOM_RIGHT" file="common/chip_malware_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_LEFT" file="common/chip_malware_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_CENTER" file="common/chip_malware_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_RIGHT" file="common/chip_malware_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_TOP_LEFT" file="common/chip_malware_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_TOP" file="common/chip_malware_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_ORIGIN_CHIP_MALWARE_HOVER_TOP_RIGHT" file="common/chip_malware_hover_top_right.png" /> </if> + <structure type="chrome_scaled_image" name="IDR_SETTINGS_FAVICON" file="common/favicon_settings.png" /> <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 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 or is_ios"> + <structure type="chrome_scaled_image" name="IDR_STAR" file="common/star.png" /> + <structure type="chrome_scaled_image" name="IDR_STAR_LIT" file="common/star_lit.png" /> + <if expr="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" /> <structure type="chrome_scaled_image" name="IDR_STOP_P" file="common/browser_stop_pressed.png" /> </if> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <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> <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_PLACEHOLDER" file="common/supervised_user_placeholder.png" /> - <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" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> + <if expr="toolkit_views"> <structure type="chrome_scaled_image" name="IDR_TAB_ACTIVE_CENTER" file="common/tab_active_center.png" /> <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 or is_ios"> + <if expr="(is_macosx or is_ios) and not toolkit_views"> <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" /> - <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="back_large.png" /> - <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="forward_large.png" /> - <structure type="chrome_scaled_image" name="IDR_TABPOSE_CLOSE" file="mac/tabpose_close.png" /> + <structure type="chrome_scaled_image" name="IDR_SWIPE_BACK" file="common/back_large.png" /> + <structure type="chrome_scaled_image" name="IDR_SWIPE_FORWARD" file="common/forward_large.png" /> </if> <!-- 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 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> - <if expr="pp_ifdef('toolkit_views')"> + <if expr="toolkit_views"> <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 or is_ios"> + <if expr="(is_macosx or is_ios) and not toolkit_views"> <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> @@ -984,69 +1102,65 @@ <structure type="chrome_scaled_image" name="IDR_TAB_CAPTURE_INDICATOR" file="common/tab_capture_indicator.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 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" /> - </if> - <if expr="pp_ifdef('toolkit_views')"> + <if expr="toolkit_views"> <structure type="chrome_scaled_image" name="IDR_TAB_INACTIVE_CENTER" file="common/tab_inactive_center.png" /> <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 or is_ios"> + <if expr="(is_macosx or is_ios) and not toolkit_views"> <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" /> </if> <structure type="chrome_scaled_image" name="IDR_TAB_RECORDING_INDICATOR" file="common/tab_recording_indicator.png" /> <structure type="chrome_scaled_image" name="IDR_TABLET_FAVICON" file="common/favicon_tablet.png" /> - <if expr="pp_ifdef('chromeos')"> + <if expr="chromeos"> <structure type="chrome_scaled_image" name="IDR_TECHNICAL_ERROR" file="cros/technical_error.png" /> </if> - <if expr="not pp_ifdef('_google_chrome')"> - <structure type="chrome_scaled_image" name="IDR_TEMPORARY_GOOGLE_PLUS_ICON" file="chromium/ic_gplus_color_16.png" /> - </if> - <if expr="pp_ifdef('_google_chrome')"> - <structure type="chrome_scaled_image" name="IDR_TEMPORARY_GOOGLE_PLUS_ICON" file="google_chrome/ic_gplus_color_16.png" /> - </if> - + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_BOTTOM" file="common/textfield_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_BOTTOM_LEFT" file="common/textfield_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_BOTTOM_RIGHT" file="common/textfield_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_CENTER" file="common/textfield_center.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_LEFT" file="common/textfield_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_RIGHT" file="common/textfield_right.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_TOP" file="common/textfield_top.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_TOP_LEFT" file="common/textfield_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_TEXTFIELD_TOP_RIGHT" file="common/textfield_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_BUTTON_BACKGROUND" file="notused.png" /> - <if expr="not pp_ifdef('use_ash')"> + <if expr="not use_ash"> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="theme_frame.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="theme_frame_inactive.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="theme_frame_incognito.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="theme_frame_incognito_inactive.png" /> </if> - <if expr="pp_ifdef('use_ash')"> + <if expr="use_ash"> <!-- Ash has a gray frame, Windows uses blue. --> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="cros/theme_frame_active.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="cros/theme_frame_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="cros/theme_frame_incognito_active.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="cros/theme_frame_incognito_inactive.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_WIN" file="theme_frame.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_WIN" file="theme_frame_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_WIN" file="theme_frame_incognito.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN" file="theme_frame_incognito_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME" file="common/ash/theme_frame_active.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE" file="common/ash/theme_frame_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO" file="common/ash/theme_frame_incognito_active.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE" file="common/ash/theme_frame_incognito_inactive.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_DESKTOP" file="theme_frame.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INACTIVE_DESKTOP" file="theme_frame_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_DESKTOP" file="theme_frame_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP" file="theme_frame_incognito_inactive.png" /> </if> </if> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY" file="notused.png" /> <structure type="chrome_scaled_image" name="IDR_THEME_FRAME_OVERLAY_INACTIVE" file="notused.png" /> <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 and not is_ios"> + <if expr="not 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> - <if expr="pp_ifdef('use_ash')"> + <if expr="use_ash"> <!-- Ash has gray tab backgrounds, Windows uses blue. --> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="cros/theme_default_inactive.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="cros/theme_default_inactive.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_WIN" file="theme_tab_background.png" /> - <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN" file="theme_tab_background_incognito.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND" file="common/ash/theme_default_inactive.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO" file="common/ash/theme_default_inactive.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_DESKTOP" file="theme_tab_background.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP" file="theme_tab_background_incognito.png" /> </if> </if> <if expr="is_macosx or is_ios"> @@ -1054,14 +1168,14 @@ <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 and not is_ios"> + <if expr="not 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')"> + <if expr="use_ash"> <!-- Ash has a dark gray toolbar background, Windows has light gray. --> - <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="cros/theme_default_active.png" /> - <if expr="is_win"> - <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_WIN" file="theme_toolbar_default.png" /> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR" file="common/ash/theme_default_active.png" /> + <if expr="not chromeos"> + <structure type="chrome_scaled_image" name="IDR_THEME_TOOLBAR_DESKTOP" file="theme_toolbar_default.png" /> </if> </if> <if expr="is_macosx or is_ios"> @@ -1070,10 +1184,9 @@ </if> <!-- Instant Extended API toolbar background is common for all platforms. --> <structure type="chrome_scaled_image" name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" /> - <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="throbber_light.png" /> - <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="throbber_waiting.png" /> - <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" /> - <if expr="pp_ifdef('use_ash')"> + <structure type="chrome_scaled_image" name="IDR_THROBBER_LIGHT" file="common/throbber_light.png" /> + <structure type="chrome_scaled_image" name="IDR_THROBBER_WAITING" file="common/throbber_waiting.png" /> + <if expr="use_ash"> <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_BOTTOM" file="common/toolbar_shade_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_LEFT" file="common/toolbar_shade_left.png" /> <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_RIGHT" file="common/toolbar_shade_right.png" /> @@ -1082,20 +1195,8 @@ <if expr="is_macosx or is_ios"> <structure type="chrome_scaled_image" name="IDR_TOOLBAR_SHADE_TOP" file="mac/toolbar_shade_top.png" /> </if> - - <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 or is_ios"> - <if expr="pp_ifdef('desktop_linux')"> - <structure type="chrome_scaled_image" name="IDR_TOOLS_BADGE_AURA" file="common/browser_tools_badge_aura.png" /> - <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal_aura.png" /> - </if> - <if expr="not pp_ifdef('desktop_linux')"> - <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" /> - </if> + <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" /> </if> @@ -1109,53 +1210,42 @@ <structure type="chrome_scaled_image" name="IDR_TRANSLATE" file="translate.png" /> <structure type="chrome_scaled_image" name="IDR_TRANSLATE_ACTIVE" file="translate_active.png" /> <structure type="chrome_scaled_image" name="IDR_UP_ARROW" file="common/up_arrow.png" /> - <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" /> - <structure type="chrome_scaled_image" name="IDR_UPDATE_BADGE4" file="update_badge4.png" /> - </if> <structure type="chrome_scaled_image" name="IDR_UPDATE_FAILED" file="common/update_failed.png" /> <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_LOW" file="common/update_menu_severity_low.png" /> <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_MEDIUM" file="common/update_menu_severity_medium.png" /> <structure type="chrome_scaled_image" name="IDR_UPDATE_MENU_SEVERITY_HIGH" file="common/update_menu_severity_high.png" /> <structure type="chrome_scaled_image" name="IDR_UPDATE_UPTODATE" file="common/update_uptodate.png" /> - <if expr="pp_ifdef('chromeos')"> - <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE" file="snapshot_wide.png" /> - <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disabled.png" /> - <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png" /> - <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_NO_VIDEO" file="no_video.png" /> - <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" /> + <if expr="chromeos"> + <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_CAPTURE" file="common/snapshot_wide.png" /> + <structure type="chrome_scaled_image" name="IDR_USER_IMAGE_RECYCLE" file="common/discard_wide.png" /> </if> <structure type="chrome_scaled_image" name="IDR_WALLET_ICON" file="wallet.png" /> <structure type="chrome_scaled_image" name="IDR_WALLET_LOGO" file="common/wallet_logo.png" /> - <structure type="chrome_scaled_image" name="IDR_WALLET_STEP_CHECK" file="common/payment_checkmark.png" /> - <structure type="chrome_scaled_image" name="IDR_WARNING" file="alert_small.png" /> + <structure type="chrome_scaled_image" name="IDR_WARNING" file="common/alert_small.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_CENTER" file="website_settings_tabstrip_center.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_LEFT" file="website_settings_tabstrip_left.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TABSTRIP_RIGHT" file="website_settings_tabstrip_right.png" /> - <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_BACKGROUND" file="website_settings_tab_background.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_CENTER" file="website_settings_tab_center.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_LEFT" file="website_settings_tab_left.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_RIGHT" file="website_settings_tab_right.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_CENTER2" file="website_settings_tab_center2.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_LEFT2" file="website_settings_tab_left2.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSITE_SETTINGS_TAB_RIGHT2" file="website_settings_tab_right2.png" /> - <if expr="not pp_ifdef('_google_chrome')"> + <if expr="not _google_chrome"> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="chromium/webstore_icon.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="chromium/webstore_icon_16.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="chromium/webstore_icon_24.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="chromium/webstore_icon_32.png" /> </if> - <if expr="pp_ifdef('_google_chrome')"> + <if expr="_google_chrome"> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON" file="google_chrome/webstore_icon.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file="google_chrome/webstore_icon_16.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file="google_chrome/webstore_icon_24.png" /> <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file="google_chrome/webstore_icon_32.png" /> </if> - <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_minus.png" /> - <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus.png" /> - <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_reset.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="common/zoom_minus.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="common/zoom_plus.png" /> + <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="common/zoom_reset.png" /> <!-- People search images --> <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL" file="common/mail.png" /> |