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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources.grd

Issue 152143009: Clarify settings UI in multi-profiles mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/theme/default_200_percent/cros/secondary_user_settings.png ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/resources/options/browser_options.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- This grd file contains images that are pre-scaled for device scale 2 <!-- This grd file contains images that are pre-scaled for device scale
3 factors. The image returned by |base::ResourceBundle::GetImageNamed| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed|
4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
5 |fallback_to_low_resolution| attribute controls behavior when 5 |fallback_to_low_resolution| attribute controls behavior when
6 an image file is missing for target scale factor. If true, chrome 6 an image file is missing for target scale factor. If true, chrome
7 will automatically scale the 1x image to the target scale factor. 7 will automatically scale the 1x image to the target scale factor.
8 If false, build will fail due to missing resources. This is 8 If false, build will fail due to missing resources. This is
9 currently set to true for all resources, but the default will 9 currently set to true for all resources, but the default will
10 become false in near future. 10 become false in near future.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 <if expr="is_win"> 147 <if expr="is_win">
148 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN " file="content_top_center.png" /> 148 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_CENTER_WIN " file="content_top_center.png" />
149 </if> 149 </if>
150 </if> 150 </if>
151 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f ile="content_top_left_corner.png" /> 151 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER" f ile="content_top_left_corner.png" />
152 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA SK" file="content_top_left_corner_mask.png" /> 152 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_LEFT_CORNER_MA SK" file="content_top_left_corner_mask.png" />
153 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" /> 153 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER" file="content_top_right_corner.png" />
154 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M ASK" file="content_top_right_corner_mask.png" /> 154 <structure type="chrome_scaled_image" name="IDR_CONTENT_TOP_RIGHT_CORNER_M ASK" file="content_top_right_corner_mask.png" />
155 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI ON" file="common/controlled_setting_extension.png" /> 155 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_EXTENSI ON" file="common/controlled_setting_extension.png" />
156 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO RY" file="common/controlled_setting_mandatory.png" /> 156 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_MANDATO RY" file="common/controlled_setting_mandatory.png" />
157 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_OWNER" file="common/controlled_setting_owner.png" />
158 <if expr="pp_ifdef('chromeos')">
159 <structure type="chrome_scaled_image" name="IDR_CONTROLLED_SETTING_SHARE D" file="cros/controlled_setting_shared.png" />
160 </if>
157 <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="cookie. png" /> 161 <structure type="chrome_scaled_image" name="IDR_COOKIE_ICON" file="cookie. png" />
158 <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file= "cookie_storage.png" /> 162 <structure type="chrome_scaled_image" name="IDR_COOKIE_STORAGE_ICON" file= "cookie_storage.png" />
159 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file ="common/credit_card_cvc_hint.png" /> 163 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file ="common/credit_card_cvc_hint.png" />
160 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" file="common/credit_card_cvc_hint_amex.png" /> 164 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" file="common/credit_card_cvc_hint_amex.png" />
161 <if expr="pp_ifdef('chromeos')"> 165 <if expr="pp_ifdef('chromeos')">
162 <structure type="chrome_scaled_image" name="IDR_CROS_DEFAULT_THROBBER" f ile="cros/default_throbber.png" /> 166 <structure type="chrome_scaled_image" name="IDR_CROS_DEFAULT_THROBBER" f ile="cros/default_throbber.png" />
163 </if> 167 </if>
164 <structure type="chrome_scaled_image" name="IDR_DOCK_HIGH" file="dock_tab_ high.png" /> 168 <structure type="chrome_scaled_image" name="IDR_DOCK_HIGH" file="dock_tab_ high.png" />
165 <structure type="chrome_scaled_image" name="IDR_DOCK_MAX" file="dock_tab_m ax.png" /> 169 <structure type="chrome_scaled_image" name="IDR_DOCK_MAX" file="dock_tab_m ax.png" />
166 <structure type="chrome_scaled_image" name="IDR_DOCK_WIDE" file="dock_tab_ wide.png" /> 170 <structure type="chrome_scaled_image" name="IDR_DOCK_WIDE" file="dock_tab_ wide.png" />
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="common/b rowser_reload_hover.png" /> 866 <structure type="chrome_scaled_image" name="IDR_RELOAD_H" file="common/b rowser_reload_hover.png" />
863 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/b rowser_reload_pressed.png" /> 867 <structure type="chrome_scaled_image" name="IDR_RELOAD_P" file="common/b rowser_reload_pressed.png" />
864 <structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="com mon/browser_reload_dimmed.png" /> 868 <structure type="chrome_scaled_image" name="IDR_RELOAD_DIMMED" file="com mon/browser_reload_dimmed.png" />
865 </if> 869 </if>
866 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "restore_button_mask.png" /> 870 <structure type="chrome_scaled_image" name="IDR_RESTORE_BUTTON_MASK" file= "restore_button_mask.png" />
867 <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/ favicon_sad_tab.png" /> 871 <structure type="chrome_scaled_image" name="IDR_SAD_FAVICON" file="common/ favicon_sad_tab.png" />
868 <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" /> 872 <structure type="chrome_scaled_image" name="IDR_SAD_TAB" file="sadtab.png" />
869 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file ="safebrowsing_warning.png" /> 873 <structure type="chrome_scaled_image" name="IDR_SAFEBROWSING_WARNING" file ="safebrowsing_warning.png" />
870 <structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATIO N_GRIP" file="screen_capture_notification_grip.png" /> 874 <structure type="chrome_scaled_image" name="IDR_SCREEN_CAPTURE_NOTIFICATIO N_GRIP" file="screen_capture_notification_grip.png" />
871 <structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_IC ON" file="common/notification_screenshot_icon.png" /> 875 <structure type="chrome_scaled_image" name="IDR_SCREENSHOT_NOTIFICATION_IC ON" file="common/notification_screenshot_icon.png" />
876 <if expr="pp_ifdef('chromeos')">
877 <structure type="chrome_scaled_image" name="IDR_SECONDARY_USER_SETTINGS" file="cros/secondary_user_settings.png" />
878 </if>
872 <if expr="pp_ifdef('enable_settings_app')"> 879 <if expr="pp_ifdef('enable_settings_app')">
873 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" f ile="settings_app_icon_128.png" /> 880 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_128" f ile="settings_app_icon_128.png" />
874 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" fi le="settings_app_icon_16.png" /> 881 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_16" fi le="settings_app_icon_16.png" />
875 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_32" fi le="settings_app_icon_32.png" /> 882 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_32" fi le="settings_app_icon_32.png" />
876 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_48" fi le="settings_app_icon_48.png" /> 883 <structure type="chrome_scaled_image" name="IDR_SETTINGS_APP_ICON_48" fi le="settings_app_icon_48.png" />
877 </if> 884 </if>
878 <if expr="pp_ifdef('toolkit_views')"> 885 <if expr="pp_ifdef('toolkit_views')">
879 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM_LEFT" file="common/chip_brokenssl_bottom_left.png" /> 886 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM_LEFT" file="common/chip_brokenssl_bottom_left.png" />
880 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM" file="common/chip_brokenssl_bottom.png" /> 887 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM" file="common/chip_brokenssl_bottom.png" />
881 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM_RIGHT" file="common/chip_brokenssl_bottom_right.png" /> 888 <structure type="chrome_scaled_image" name="IDR_SITE_CHIP_BROKENSSL_BOTT OM_RIGHT" file="common/chip_brokenssl_bottom_right.png" />
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1180 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1174 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1181 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1175 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1182 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1176 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1183 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1177 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1184 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1178 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1185 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1179 1186
1180 </structures> 1187 </structures>
1181 </release> 1188 </release>
1182 </grit> 1189 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/cros/secondary_user_settings.png ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/resources/options/browser_options.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698