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

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

Issue 1234593002: Changed omnibox rendering to use a single asset. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved LocationBarView::CreateBorderPainter() method inline. Created 5 years, 5 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 | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 </if> 491 </if>
492 <if expr="is_win or desktop_linux"> 492 <if expr="is_win or desktop_linux">
493 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT _DISTURB_ATTENTION" file="common/notification_tray_do_not_disturb_attention.png" /> 493 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT _DISTURB_ATTENTION" file="common/notification_tray_do_not_disturb_attention.png" />
494 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT _DISTURB_EMPTY" file="common/notification_tray_do_not_disturb_empty.png" /> 494 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_DO_NOT _DISTURB_EMPTY" file="common/notification_tray_do_not_disturb_empty.png" />
495 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_ATTENT ION" file="common/notification_tray_attention.png" /> 495 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_ATTENT ION" file="common/notification_tray_attention.png" />
496 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_EMPTY" file="common/notification_tray_empty.png" /> 496 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_TRAY_EMPTY" file="common/notification_tray_empty.png" />
497 </if> 497 </if>
498 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_ICON" file="common/notification_welcome_icon.png" /> 498 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_ICON" file="common/notification_welcome_icon.png" />
499 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_LEARN _MORE" file="common/notification_welcome_learn_more.png" /> 499 <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_WELCOME_LEARN _MORE" file="common/notification_welcome_learn_more.png" />
500 <structure type="chrome_scaled_image" name="IDR_NOTIFIER_BLOCK_BUTTON" fil e="common/block_notifier.png" /> 500 <structure type="chrome_scaled_image" name="IDR_NOTIFIER_BLOCK_BUTTON" fil e="common/block_notifier.png" />
501 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_BORDER" file="comm on/omnibox_border.png" />
501 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR_SELECTE D" file="common/omnibox_calculator_selected.png" /> 502 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CALCULATOR_SELECTE D" file="common/omnibox_calculator_selected.png" />
502 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM" file="common/omnibox_content_setting_bubble_bottom.png" /> 503 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM" file="common/omnibox_content_setting_bubble_bottom.png" />
503 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_LEFT" file="common/omnibox_content_setting_bubble_bottom_left.png" / > 504 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_LEFT" file="common/omnibox_content_setting_bubble_bottom_left.png" / >
504 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_RIGHT" file="common/omnibox_content_setting_bubble_bottom_right.png" /> 505 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_BOTTOM_RIGHT" file="common/omnibox_content_setting_bubble_bottom_right.png" />
505 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_CENTER" file="common/omnibox_content_setting_bubble_center.png" /> 506 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_CENTER" file="common/omnibox_content_setting_bubble_center.png" />
506 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_LEFT" file="common/omnibox_content_setting_bubble_left.png" /> 507 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_LEFT" file="common/omnibox_content_setting_bubble_left.png" />
507 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_RIGHT" file="common/omnibox_content_setting_bubble_right.png" /> 508 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_RIGHT" file="common/omnibox_content_setting_bubble_right.png" />
508 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP" file="common/omnibox_content_setting_bubble_top.png" /> 509 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP" file="common/omnibox_content_setting_bubble_top.png" />
509 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_LEFT" file="common/omnibox_content_setting_bubble_top_left.png" /> 510 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_LEFT" file="common/omnibox_content_setting_bubble_top_left.png" />
510 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_RIGHT" file="common/omnibox_content_setting_bubble_top_right.png" /> 511 <structure type="chrome_scaled_image" name="IDR_OMNIBOX_CONTENT_SETTING_BU BBLE_TOP_RIGHT" file="common/omnibox_content_setting_bubble_top_right.png" />
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 <!-- People search images --> 1021 <!-- People search images -->
1021 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1022 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1022 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1023 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1023 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1024 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1024 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1025 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1025 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1026 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1027 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1027 </structures> 1028 </structures>
1028 </release> 1029 </release>
1029 </grit> 1030 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698