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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 22859018: Added image and button to privet notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@privet_notifications4
Patch Set: Updated to fix conflicts with master and remove binary files Created 7 years, 3 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/local_discovery/privet_notifications.h » ('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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" fil e="infobar_savepassword.png" /> 416 <structure type="chrome_scaled_image" name="IDR_INFOBAR_SAVE_PASSWORD" fil e="infobar_savepassword.png" />
417 <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="infob ar_theme.png" /> 417 <structure type="chrome_scaled_image" name="IDR_INFOBAR_THEME" file="infob ar_theme.png" />
418 <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="i nfobar_translate.png" /> 418 <structure type="chrome_scaled_image" name="IDR_INFOBAR_TRANSLATE" file="i nfobar_translate.png" />
419 <structure type="chrome_scaled_image" name="IDR_INFOBAR_WARNING" file="com mon/infobar_warning.png" /> 419 <structure type="chrome_scaled_image" name="IDR_INFOBAR_WARNING" file="com mon/infobar_warning.png" />
420 <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT" file="common/ input_alert.png" /> 420 <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT" file="common/ input_alert.png" />
421 <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT_MENU" file="co mmon/input_alert_menu.png" /> 421 <structure type="chrome_scaled_image" name="IDR_INPUT_ALERT_MENU" file="co mmon/input_alert_menu.png" />
422 <structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="common/i nput_good.png" /> 422 <structure type="chrome_scaled_image" name="IDR_INPUT_GOOD" file="common/i nput_good.png" />
423 <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" /> 423 <structure type="chrome_scaled_image" name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" />
424 <structure type="chrome_scaled_image" name="IDR_KILLED_TAB" file="killtab. png" /> 424 <structure type="chrome_scaled_image" name="IDR_KILLED_TAB" file="killtab. png" />
425 <structure type="chrome_scaled_image" name="IDR_LAPTOP_FAVICON" file="comm on/favicon_laptop.png" /> 425 <structure type="chrome_scaled_image" name="IDR_LAPTOP_FAVICON" file="comm on/favicon_laptop.png" />
426 <if expr="pp_ifdef('enable_mdns')">
427 <structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRI NT_ICON" file="common/cloudprint.png" />
428 </if>
426 <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="c ommon/location_bar_http.png" /> 429 <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="c ommon/location_bar_http.png" />
427 <if expr="pp_ifdef('chromeos')"> 430 <if expr="pp_ifdef('chromeos')">
428 <!-- TODO(nkostylev): This resource needs to be removed when cros login code is moved to ash. --> 431 <!-- TODO(nkostylev): This resource needs to be removed when cros login code is moved to ash. -->
429 <structure type="chrome_scaled_image" name="IDR_LAUNCHER_BACKGROUND" fil e="cros/launcher_background.png" /> 432 <structure type="chrome_scaled_image" name="IDR_LAUNCHER_BACKGROUND" fil e="cros/launcher_background.png" />
430 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER" file ="avatar_beaker.png" /> 433 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER" file ="avatar_beaker.png" />
431 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_1" fi le="avatar_bee.png" /> 434 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_1" fi le="avatar_bee.png" />
432 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_2" fi le="avatar_briefcase.png" /> 435 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_2" fi le="avatar_briefcase.png" />
433 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_3" fi le="avatar_circles.png" /> 436 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_3" fi le="avatar_circles.png" />
434 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_4" fi le="avatar_cloud.png" /> 437 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_4" fi le="avatar_cloud.png" />
435 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_5" fi le="avatar_cupcake.png" /> 438 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_5" fi le="avatar_cupcake.png" />
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" /> 994 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_16" file=" google_chrome/webstore_icon_16.png" />
992 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" /> 995 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_24" file=" google_chrome/webstore_icon_24.png" />
993 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" /> 996 <structure type="chrome_scaled_image" name="IDR_WEBSTORE_ICON_32" file=" google_chrome/webstore_icon_32.png" />
994 </if> 997 </if>
995 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" /> 998 <structure type="chrome_scaled_image" name="IDR_ZOOM_MINUS" file="zoom_min us.png" />
996 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" /> 999 <structure type="chrome_scaled_image" name="IDR_ZOOM_PLUS" file="zoom_plus .png" />
997 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" /> 1000 <structure type="chrome_scaled_image" name="IDR_ZOOM_NORMAL" file="zoom_re set.png" />
998 </structures> 1001 </structures>
999 </release> 1002 </release>
1000 </grit> 1003 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/local_discovery/privet_notifications.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698