components/resources/autofill_scaled_resources.grdp - Issue 2385063005: Make PermissionRequest::GetIconId return different types

Side by Side Diff: components/resources/autofill_scaled_resources.grdp

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)

Patch Set: android Created 4 years, 2 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:

« chrome/browser/permissions/permission_request_impl.cc ('K') | « chrome/browser/ui/views/website_settings/permission_prompt_impl.cc ('k') | ui/gfx/vector_icons/BUILD.gn » ('j') | ui/gfx/vector_icons/microphone.icon » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit-part>	2 <grit-part>

3 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_AMEX" file="autofi ll/amex.png" />	3 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_AMEX" file="autofi ll/amex.png" />

4 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_DISCOVER" file="au tofill/discover.png" />	4 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_DISCOVER" file="au tofill/discover.png" />

5 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_GENERIC" file="aut ofill/cc-generic.png" />	5 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_GENERIC" file="aut ofill/cc-generic.png" />

6 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_MASTERCARD" file=" autofill/mastercard.png" />	6 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_MASTERCARD" file=" autofill/mastercard.png" />

7 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_VISA" file="autofi ll/visa.png" />	7 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_CC_VISA" file="autofi ll/visa.png" />

8	8

9 <!-- These are not used on desktop, only Android, so use a placeholder file.	9 <!-- These are not used on desktop, only Android, so use a placeholder file.

10 TODO(rouslan): Remove non-keyboard-accessory icon when keyboard	10 TODO(rouslan): Remove non-keyboard-accessory icon when keyboard

(...skipping 12 matching lines...) Expand all Loading...
23 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_DINERS" file="auto fill/cc-generic.png" />	23 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_DINERS" file="auto fill/cc-generic.png" />

24 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_DISCOVER" file="au tofill/cc-generic.png" />	24 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_DISCOVER" file="au tofill/cc-generic.png" />

25 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_GENERIC" file="aut ofill/cc-generic.png" />	25 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_GENERIC" file="aut ofill/cc-generic.png" />

26 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_JCB" file="autofil l/cc-generic.png" />	26 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_JCB" file="autofil l/cc-generic.png" />

27 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_MASTERCARD" file=" autofill/cc-generic.png" />	27 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_MASTERCARD" file=" autofill/cc-generic.png" />

28 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_UNIONPAY" file="au tofill/cc-generic.png" />	28 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_UNIONPAY" file="au tofill/cc-generic.png" />

29 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_VISA" file="autofi ll/cc-generic.png" />	29 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_PR_VISA" file="autofi ll/cc-generic.png" />

30	30

31 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file="au tofill/credit_card_cvc_hint.png" />	31 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT" file="au tofill/credit_card_cvc_hint.png" />

32 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" fil e="autofill/credit_card_cvc_hint_amex.png" />	32 <structure type="chrome_scaled_image" name="IDR_CREDIT_CARD_CVC_HINT_AMEX" fil e="autofill/credit_card_cvc_hint_amex.png" />

33 <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="aut ofill/infobar_autofill_cc.png" />	33 <if expr="is_ios or is_android">

	34 <structure type="chrome_scaled_image" name="IDR_INFOBAR_AUTOFILL_CC" file="a utofill/infobar_autofill_cc.png" />

	35 </if>

34 <if expr="is_macosx or is_ios">	36 <if expr="is_macosx or is_ios">

35 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON" file= "autofill/autofill_tooltip_icon.png" />	37 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON" file= "autofill/autofill_tooltip_icon.png" />

36 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON_H" fil e="autofill/autofill_tooltip_icon_hover.png" />	38 <structure type="chrome_scaled_image" name="IDR_AUTOFILL_TOOLTIP_ICON_H" fil e="autofill/autofill_tooltip_icon_hover.png" />

37 </if>	39 </if>

38 </grit-part>	40 </grit-part>

OLD	NEW