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

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

Issue 13947002: Update App Launcher icons, splitting for Chromium, Chrome, Canary. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 7 years, 8 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
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 22 matching lines...) Expand all
33 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON_PRESSED" file="common/action_box_button_pressed.png" /> 33 <structure type="chrome_scaled_image" name="IDR_ACTION_BOX_BUTTON_PRESSED" file="common/action_box_button_pressed.png" />
34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file=" allowed_fullscreen.png" /> 34 <structure type="chrome_scaled_image" name="IDR_ALLOWED_FULLSCREEN" file=" allowed_fullscreen.png" />
35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="allo wed_images.png" /> 35 <structure type="chrome_scaled_image" name="IDR_ALLOWED_IMAGES" file="allo wed_images.png" />
36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file ="allowed_mouse_cursor.png" /> 36 <structure type="chrome_scaled_image" name="IDR_ALLOWED_MOUSE_CURSOR" file ="allowed_mouse_cursor.png" />
37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file ="allowed_notifications.png" /> 37 <structure type="chrome_scaled_image" name="IDR_ALLOWED_NOTIFICATION" file ="allowed_notifications.png" />
38 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="allo wed_popups.png" /> 38 <structure type="chrome_scaled_image" name="IDR_ALLOWED_POPUPS" file="allo wed_popups.png" />
39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="all owed_plugins.png" /> 39 <structure type="chrome_scaled_image" name="IDR_ALLOWED_PLUGINS" file="all owed_plugins.png" />
40 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file=" allowed_script.png" /> 40 <structure type="chrome_scaled_image" name="IDR_ALLOWED_JAVASCRIPT" file=" allowed_script.png" />
41 <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="ap p_default_icon.png" /> 41 <structure type="chrome_scaled_image" name="IDR_APP_DEFAULT_ICON" file="ap p_default_icon.png" />
42 <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_d roparrow.png" /> 42 <structure type="chrome_scaled_image" name="IDR_APP_DROPARROW" file="app_d roparrow.png" />
43 <if expr="pp_ifdef('enable_app_list') and is_win"> 43 <if expr="pp_ifdef('enable_app_list') and is_win and not pp_ifdef('_google _chrome')">
44 <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="win/app_ list.png" /> 44 <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="chromium /app_list_48.png" />
45 </if>
46 <if expr="pp_ifdef('enable_app_list') and is_win and pp_ifdef('_google_chr ome')">
47 <structure type="chrome_scaled_image" name="IDR_APP_LIST" file="google_c hrome/app_list_48.png" />
48 <structure type="chrome_scaled_image" name="IDR_APP_LIST_SXS" file="goog le_chrome/app_list_sxs_48.png" />
45 </if> 49 </if>
46 <if expr="pp_ifdef('enable_app_list') and not pp_ifdef('chromeos')"> 50 <if expr="pp_ifdef('enable_app_list') and not pp_ifdef('chromeos')">
47 <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" fi le="win/app_list_v1_overlay.png" /> 51 <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" fi le="win/app_list_v1_overlay.png" />
48 </if> 52 </if>
49 <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media .png" /> 53 <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media .png" />
50 <if expr="pp_ifdef('toolkit_views')"> 54 <if expr="pp_ifdef('toolkit_views')">
51 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file=" win/app_window_close.png" /> 55 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file=" win/app_window_close.png" />
52 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file ="win/app_window_close_hover.png" /> 56 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_H" file ="win/app_window_close_hover.png" />
53 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file ="win/app_window_close_active.png" /> 57 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_P" file ="win/app_window_close_active.png" />
54 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file ="win/app_window_close_unfocused.png" /> 58 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE_U" file ="win/app_window_close_unfocused.png" />
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> 932 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" />
929 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> 933 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" />
930 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 934 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
931 </if> 935 </if>
932 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 936 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
933 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 937 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
934 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> 938 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" />
935 </structures> 939 </structures>
936 </release> 940 </release>
937 </grit> 941 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_100_percent/win/app_list.png ('k') | chrome/browser/ui/app_list/app_list_service_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698