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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 years, 9 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/small_bubble.png ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »
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 28 matching lines...) Expand all
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">
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="win/app_ list.png" />
45 </if> 45 </if>
46 <if expr="pp_ifdef('enable_app_list') and not pp_ifdef('chromeos')"> 46 <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="app_list_tab_overlay.png" /> 47 <structure type="chrome_scaled_image" name="IDR_APP_LIST_TAB_OVERLAY" fi le="app_list_tab_overlay.png" />
48 </if> 48 </if>
49 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB" file ="nub.png" />
50 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_NUB_MASK" file="nub_mask.png" />
51 <structure type="chrome_scaled_image" name="IDR_APP_NOTIFICATION_SMALL_BUB BLE" file="small_bubble.png" />
52 <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media .png" /> 49 <structure type="chrome_scaled_image" name="IDR_ASK_MEDIA" file="ask_media .png" />
53 <if expr="pp_ifdef('toolkit_views')"> 50 <if expr="pp_ifdef('toolkit_views')">
54 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_CLOSE" file=" win/app_window_close.png" /> 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_H" file ="win/app_window_close_hover.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_P" file ="win/app_window_close_active.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_U" file ="win/app_window_close_unfocused.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_RESTORE" file ="win/app_window_restore.png" /> 55 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE" file ="win/app_window_restore.png" />
59 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" fi le="win/app_window_restore_hover.png" /> 56 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_H" fi le="win/app_window_restore_hover.png" />
60 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" fi le="win/app_window_restore_active.png" /> 57 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_RESTORE_P" fi le="win/app_window_restore_active.png" />
61 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" fil e="win/app_window_maximize.png" /> 58 <structure type="chrome_scaled_image" name="IDR_APP_WINDOW_MAXIMIZE" fil e="win/app_window_maximize.png" />
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 914 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
918 </if> 915 </if>
919 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 916 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
920 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 917 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
921 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> 918 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" />
922 <!-- Audio playing indicator. Favicon-sized with equalizer-like animation frames --> 919 <!-- Audio playing indicator. Favicon-sized with equalizer-like animation frames -->
923 <structure type="chrome_scaled_image" name="IDR_AUDIO_ANIMATION" file="com mon/audio_animation.png" /> 920 <structure type="chrome_scaled_image" name="IDR_AUDIO_ANIMATION" file="com mon/audio_animation.png" />
924 </structures> 921 </structures>
925 </release> 922 </release>
926 </grit> 923 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/default_200_percent/small_bubble.png ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698