From 95570bcf189b92a8341b75a07fe4beb63aeb22c1 Mon Sep 17 00:00:00 2001 From: Evan Stade Date: Tue, 8 Jan 2019 23:08:26 +0000 Subject: [PATCH] Remove unused png assets. Use cookie vector icon in cookie tree model (page info bubble sub- dialog). Also remove reference there to IDR_DEFAULT_FAVICON, which wasn't being used. Bug: 522168 Change-Id: I655ba06ae438756ca47db92cfe97f00342493d39 Reviewed-on: https://chromium-review.googlesource.com/c/1399161 Commit-Queue: Evan Stade Reviewed-by: Mitsuru Oshima Reviewed-by: Christian Dullweber Cr-Commit-Position: refs/heads/master@{#620922} --- .../default_100_percent/common/alert_small.png | Bin 494 -> 0 bytes .../common/app_list_v1_overlay.png | Bin 164 -> 0 bytes .../theme/default_100_percent/common/cookies.png | Bin 285 -> 0 bytes .../common/supervised_user_placeholder.png | Bin 327 -> 0 bytes .../default_200_percent/common/alert_small.png | Bin 1055 -> 0 bytes .../common/app_list_v1_overlay.png | Bin 223 -> 0 bytes .../theme/default_200_percent/common/cookies.png | Bin 521 -> 0 bytes .../common/supervised_user_placeholder.png | Bin 653 -> 0 bytes chrome/app/theme/theme_resources.grd | 6 ------ .../browser/browsing_data/cookies_tree_model.cc | 14 ++++++-------- .../browser/browsing_data/cookies_tree_model.h | 6 +----- 11 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 chrome/app/theme/default_100_percent/common/alert_small.png delete mode 100644 chrome/app/theme/default_100_percent/common/app_list_v1_overlay.png delete mode 100644 chrome/app/theme/default_100_percent/common/cookies.png delete mode 100644 chrome/app/theme/default_100_percent/common/supervised_user_placeholder.png delete mode 100644 chrome/app/theme/default_200_percent/common/alert_small.png delete mode 100644 chrome/app/theme/default_200_percent/common/app_list_v1_overlay.png delete mode 100644 chrome/app/theme/default_200_percent/common/cookies.png delete mode 100644 chrome/app/theme/default_200_percent/common/supervised_user_placeholder.png diff --git a/chrome/app/theme/default_100_percent/common/alert_small.png b/chrome/app/theme/default_100_percent/common/alert_small.png deleted file mode 100644 index 342b2dda2cf4c0aae4795e9b48e08c9f4a7011d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmVSOhVxezsUJTWMADMxa7W^q0YyO<0)#0DIjS%$!4wc`x-$Xx zH>E8n#8AV;f|7&6(1Q*nRWG-t{UyNTTN16Msp_Nw5i%h!NEN_2n)#;0Qvk9WSEc!w zA{|2Y+XcDCKnQfF0zA6;MNJjbd~`@hsC>_h9nZnG$GaZwNgY*TOXB>tv_AzrydlvT znowmmqY93X4HvF1xOi>Br-d06F@m4~yrt<807*qoM6N<$f;bM+z5oCK diff --git a/chrome/app/theme/default_100_percent/common/app_list_v1_overlay.png b/chrome/app/theme/default_100_percent/common/app_list_v1_overlay.png deleted file mode 100644 index 84765577e26afaec0f8d3e49d35e0f0ee26dee09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6vOQfKLn>}9y=chSpup4mkgrF! zii7XL${61{5|XxxRWsDKUfPf$&Gvco-h4&}HCuH@UN1HQt<&bL84XSj`T;3#bL}?h z-JHsD;F(zS=JPTQhS^8i+qc}*{lWf0nnCgKqbbLO)m5Lge2bi%SLGm_`1kFbc%Zcm Mp00i_>zopr00MtGssI20 diff --git a/chrome/app/theme/default_100_percent/common/cookies.png b/chrome/app/theme/default_100_percent/common/cookies.png deleted file mode 100644 index 7ebf43f5d4e529cbc472175e4d7d0c54b21e87da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmV+&0pk9NP)&Wj$cvtf%Jz4rUZege?b0u zs3YMDo<)5Iv&v(-!Td(JH^JOD2^`T{NG^Dg#ETSAK!NWu`Z3XP1^;55FoGIcH%uBc jvOY(jk8Xq;P8a|Ho^P*xhvMP600000NkvXXu0mjful#Y^ diff --git a/chrome/app/theme/default_100_percent/common/supervised_user_placeholder.png b/chrome/app/theme/default_100_percent/common/supervised_user_placeholder.png deleted file mode 100644 index 7a03286e1b6debc30bf8752d1b1931d7c55b82b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmV-N0l5B&P)0X6*zaqD11=@+>89S2nO6Qqca4npVb7>?mAasZq zhmdgljJzxvde3++hYPp2nGV7TLnau`+NQ23DqOd_s;I-rKW0?SRO}%UUqZyue_~d} zveF&1EX|U@CuU1GtC?AIEK#wM#sqF^soRQ)YbF-a3}X^3ISJ#cU_e@? zQU<+tLqJR}#J(wi*yEfh-pH^lc;T>jc^hD@1bg*j7(^xdhDltRNj zJ7OoiE3;s-K6T1!ZR&+B`aDoLctqdFt7G{@9Aey{V=G5&SKP;+u}>9qt!k&~a%@8< Z<_CJz3*vv!RJi~E002ovPDHLkV1n&di;n;R diff --git a/chrome/app/theme/default_200_percent/common/alert_small.png b/chrome/app/theme/default_200_percent/common/alert_small.png deleted file mode 100644 index cad794419df1051068758b3ba58c37ace7b92ba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1055 zcmV+)1mOFLP)X!G-QisA{X5?r9|bz;|&^!MXLE_dU<4 zdn>(n|H~?z8aOrZZZW7^9r3)%vT9)uoxd7#I0=f1`HC+U6ZoF`BL z2q`~a@Zni!^WiJbe6bIFsoQ+yidjeb&YPD#y!sv|VIZV@M0r}VJ!50*QF|J$Z_P+k zDKEbH2NQvl+Qj3Pk4efa3pRwEnWdV|cFlfNTom+yliS2lew6YFMM7ugl&Ref{nNzz zF-yfs`BamR=nZ$dJ#K6287$t}D?cRK$ zk5<30NUXJz&A=#??(XH%k)8vALU};*e8ykCV+je@U%zUs>;L?VWZxfxGz)z7-!J5A z4xptkwyymm5;RPxsXu1waZ@tcHL+ATx4HHfH*PZTR5-KAedpMmu3oIZgSY9oyguLd zp?fd(8;5?V*O7sgCpC{RkTp)+Y2&_oIDgmPG?U3Nu3M=Ty-4%_3!cTrLs#I9=R(7V z|I5^Cb%!k*WP%K=(rnI|&tEaU|4{(j|GMhNpFXFR)tb|1hAM2E^;?ZPnHJ;gKH2S> z_;||q4`ra2^S!y0MsF)3a|QFcB^t(iUxUyahI>DI?N@pKfek26YwlMh>#qJlaQz=w zjI_9Z^+4~0My+%v<@bwJ%z;uUJYn4LGlX?x?eCW#bA1$}XE)h8yXLRWckGEC58)B~ zb!`LYt}eJ>$Fz6E+M3SUx|6dTbOal181LKG*UZq4-As4W3Z4E#^X@iqYT(qssew}i Z{{iW*cj96}UV8ul002ovPDHLkV1nX~7g7KK diff --git a/chrome/app/theme/default_200_percent/common/app_list_v1_overlay.png b/chrome/app/theme/default_200_percent/common/app_list_v1_overlay.png deleted file mode 100644 index 9a6f80516d7f5148d03391fe45776a8566235616..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4U%RF5iLn`9lUbW<7GURDZ6xR%X zB2diWcT_XtkP?geg9$o{y3^#uiYA972OBuOSbsk}Rk7wq3Io@a-d3@WDUy$c6}CAT zF~9uYDEusz-DYn?8pABDZ(JMLSKK&R@{m=|YJWsy-8s1h3EGQQ*Cnto_&oL8S%-tq zZ1*?XIyg={81=kLZ^^|2fzRJ9t`U3mZ|dnU>^WZ@mNcfdwf&3acT#blc<9JKw|f1g XO**HRnQ6@gx|qS!)z4*}Q$iB}G$>b; diff --git a/chrome/app/theme/default_200_percent/common/cookies.png b/chrome/app/theme/default_200_percent/common/cookies.png deleted file mode 100644 index 467b1cabecd827912c476174e35492656927d152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 521 zcmV+k0`~ohP)kdg0005dNklNu%ww^75|ifh|;ga5B>FXp~%XT28{W4+IKroew{ zlq!)VZNp_erx)m+qc~C%tMCJ=X?N!&he98q%9i$p7H=+$C9*VU04+8}SFsRBIsG6q zB{Fhc$>6!iO!+CLsF=>$-{XkP4_tS8XEqdhWGFtRkUWC(Vx^M; zR-czM$fjk$BdGYH6y@A5F`jqSKUFr`7cbobG)tbsSEDG=fB_dplgV5+&I2&rJ_41F zMViMd(_C(n;LRN90T|_21N$A=T)031wIJ={{EB4Ncw_7}&*nheE;y}@T}Y=meK))6 z$*TCpC9QHg2XrvoQZ0!0qU65gBnALJN1BV4gLndqeC`5E9??>4#V<4enpV;pd>6Sd z$-17mk?r$Lb+HFy+)ty=d%$)rgUh>2=LVH?e^M4njgDl?V(lFA*NLW~-b9*&iqSSW zX9MJ;a}KYv!=8xM&i!9tOAn&M)PgzwO!R_2;~^cV1=NM_|6gb{R9IqF@~SOS00000 LNkvXXu0mjfz_{^c diff --git a/chrome/app/theme/default_200_percent/common/supervised_user_placeholder.png b/chrome/app/theme/default_200_percent/common/supervised_user_placeholder.png deleted file mode 100644 index d0036dcbc98d96c01f73277270c57f855c475a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmV;80&@L{P)<`*ee1@qtR$Igz4fjvn;Vp zh7pbt7Qw?2a>)NSPgk%}ja)@q>^h;~!upXmyAxE_VX8>mC4%|N=a3G|6W#c*9;Az% zvh??GgIP+H$uLN}e_^Ap!p2SAE!?K^kFiG5r>9HSRoG_}GsY`Z;~g>K9adb0RZYxW zmc|3&9Tw{gV=t@LpJu=Jun+YeB?Gp`J?~*pU4^|cco|#cqxZ0ctFT^!S5`WDbqMpx zG3y&qgZInUC=2g!)G_RY5Q;~c6@I`q+pN2$&P`h<p5*rHG2n0Q(pwOO+B? z?$arPMMDD}^pWB{a}-%(foVp$$N`#yySg1DNgipjB2S1D+1RKSF0g=fu>zObX7IPu z!vIr!p+bePq!}c^4zEw@JO!ldmFcIkW;b(|NsD)Xl{DvQsV{3MZ;=XnO6K`QN0%^XA4xp5kt!`>){#n-( - - - @@ -90,7 +87,6 @@ - @@ -265,7 +261,6 @@ - @@ -324,7 +319,6 @@ - diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index e2e4e9218266b2..6b5b551a010feb 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -16,6 +16,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" +#include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" @@ -32,7 +33,9 @@ #include "net/url_request/url_request_context.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/color_palette.h" #include "ui/gfx/image/image_skia.h" +#include "ui/gfx/paint_vector_icon.h" #include "ui/resources/grit/ui_resources.h" #include "url/gurl.h" #include "url/origin.h" @@ -1175,12 +1178,8 @@ int CookiesTreeModel::GetSendForMessageID(const net::CanonicalCookie& cookie) { // Returns the set of icons for the nodes in the tree. You only need override // this if you don't want to use the default folder icons. void CookiesTreeModel::GetIcons(std::vector* icons) { - icons->push_back(*ui::ResourceBundle::GetSharedInstance() - .GetNativeImageNamed(IDR_DEFAULT_FAVICON) - .ToImageSkia()); - icons->push_back(*ui::ResourceBundle::GetSharedInstance() - .GetNativeImageNamed(IDR_COOKIES) - .ToImageSkia()); + icons->push_back( + gfx::CreateVectorIcon(kCookieIcon, 18, gfx::kChromeIconGrey)); icons->push_back(*ui::ResourceBundle::GetSharedInstance() .GetNativeImageNamed(IDR_COOKIE_STORAGE_ICON) .ToImageSkia()); @@ -1192,8 +1191,6 @@ void CookiesTreeModel::GetIcons(std::vector* icons) { int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) { CookieTreeNode* ct_node = static_cast(node); switch (ct_node->GetDetailedInfo().node_type) { - case CookieTreeNode::DetailedInfo::TYPE_HOST: - return ORIGIN; case CookieTreeNode::DetailedInfo::TYPE_COOKIE: return COOKIE; @@ -1209,6 +1206,7 @@ int CookiesTreeModel::GetIconIndex(ui::TreeModelNode* node) { case CookieTreeNode::DetailedInfo::TYPE_CACHE_STORAGE: case CookieTreeNode::DetailedInfo::TYPE_MEDIA_LICENSE: return DATABASE; + case CookieTreeNode::DetailedInfo::TYPE_HOST: case CookieTreeNode::DetailedInfo::TYPE_QUOTA: return -1; default: diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h index 560416974d72bc..2ecf39785539a9 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.h +++ b/chrome/browser/browsing_data/cookies_tree_model.h @@ -865,11 +865,7 @@ class CookiesTreeModel : public ui::TreeNodeModel { static std::unique_ptr CreateForProfile(Profile* profile); private: - enum CookieIconIndex { - ORIGIN = 0, - COOKIE = 1, - DATABASE = 2 - }; + enum CookieIconIndex { COOKIE = 0, DATABASE = 1 }; // Reset the counters for batches. void ResetBatches();