From 7bc59f7ad5caf35fefcd6c51dcd2ffe302733249 Mon Sep 17 00:00:00 2001 From: blundell Date: Wed, 5 Aug 2015 05:16:52 -0700 Subject: [PATCH] Componentize the IDR_LOCATION_HTTP resource This resource is used by Omnibox code to be componentized. This CL also adds iOS-specific versions of the resource; these differ from the version used on other platforms. BUG=515889 TBR=grt Review URL: https://codereview.chromium.org/1266103006 Cr-Commit-Position: refs/heads/master@{#341888} --- chrome/app/theme/theme_resources.grd | 1 - chrome/browser/chromeos/BUILD.gn | 1 + chrome/browser/ui/omnibox/omnibox_view.cc | 2 -- chrome/browser/ui/toolbar/test_toolbar_model.cc | 2 +- .../views/frame/web_app_left_header_view_ash_unittest.cc | 1 + chrome/chrome_tests.gypi | 1 + chrome/test/BUILD.gn | 1 + .../omnibox/ios/location_bar_http.png | Bin 0 -> 2833 bytes .../default_100_percent/omnibox}/location_bar_http.png | Bin .../omnibox/ios/location_bar_http.png | Bin 0 -> 2912 bytes .../default_200_percent/omnibox}/location_bar_http.png | Bin .../omnibox/ios/location_bar_http.png | Bin 0 -> 3083 bytes components/resources/omnibox_scaled_resources.grdp | 2 ++ 13 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 components/resources/default_100_percent/omnibox/ios/location_bar_http.png rename {chrome/app/theme/default_100_percent/common => components/resources/default_100_percent/omnibox}/location_bar_http.png (100%) create mode 100644 components/resources/default_200_percent/omnibox/ios/location_bar_http.png rename {chrome/app/theme/default_200_percent/common => components/resources/default_200_percent/omnibox}/location_bar_http.png (100%) create mode 100644 components/resources/default_300_percent/omnibox/ios/location_bar_http.png diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index dcebac7c25c9..28a604516eb9 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -425,7 +425,6 @@ - diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index ff3b5a5a64ab..b86d872168d8 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -177,6 +177,7 @@ source_set("unit_tests") { "//components/drive", "//components/policy", "//components/invalidation/public", + "//components/resources", "//crypto:platform", "//dbus", "//skia", diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc index 60ecb4620b3b..eaf2a9d0dc98 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.cc +++ b/chrome/browser/ui/omnibox/omnibox_view.cc @@ -10,13 +10,11 @@ #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/grit/generated_resources.h" #include "components/omnibox/browser/autocomplete_match.h" #include "components/omnibox/browser/omnibox_client.h" #include "components/omnibox/browser/omnibox_edit_controller.h" #include "components/toolbar/toolbar_model.h" #include "grit/components_scaled_resources.h" -#include "grit/theme_resources.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc index 9803a78ffd03..db50507ca86a 100644 --- a/chrome/browser/ui/toolbar/test_toolbar_model.cc +++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/toolbar/test_toolbar_model.h" -#include "grit/theme_resources.h" +#include "grit/components_scaled_resources.h" TestToolbarModel::TestToolbarModel() : ChromeToolbarModel(), diff --git a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc index 03a1117956e0..f0d1e7ebca97 100644 --- a/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc +++ b/chrome/browser/ui/views/frame/web_app_left_header_view_ash_unittest.cc @@ -15,6 +15,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "ui/aura/window.h" #include "ui/views/controls/button/button.h" diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 795debe55a47..96abb3789c8d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1540,6 +1540,7 @@ 'renderer', 'test_support_common', '../components/components.gyp:guest_view_test_support', + '../components/components_resources.gyp:components_resources', '../content/app/resources/content_resources.gyp:content_resources', '../crypto/crypto.gyp:crypto_test_support', '../google_apis/google_apis.gyp:google_apis_test_support', diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index edf6bc0a5182..c1a9de6f935b 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -287,6 +287,7 @@ if (!is_android) { "//chrome:strings", "//chrome:packed_extra_resources", "//chrome:packed_resources", + "//components/resources", "//content/app/resources", "//crypto:platform", "//crypto:test_support", diff --git a/components/resources/default_100_percent/omnibox/ios/location_bar_http.png b/components/resources/default_100_percent/omnibox/ios/location_bar_http.png new file mode 100644 index 0000000000000000000000000000000000000000..46a2b64d403ddb93a57b0bf51682eb94a7128e04 GIT binary patch literal 2833 zcwPY!3-0uZP)X+uL$Nkc;* zP;zf(X>4Tx07wm;mUmQB*%pV-y*Itk5+Wca^cs2zAksTX6$DXM^`x7XQc?|s+0 z08spb1j2M!0f022SQPH-!CVp(%f$Br7!UytSOLJ{W@ZFO_(THK{JlMynW#v{v-a*T zfMmPdEWc1DbJqWVks>!kBnAKqMb$PuekK>?0+ds;#ThdH1j_W4DKdsJG8Ul;qO2n0 z#IJ1jr{*iW$(WZWsE0n`c;fQ!l&-AnmjxZO1uWyz`0VP>&nP`#itsL#`S=Q!g`M=rU9)45( zJ;-|dRq-b5&z?byo>|{)?5r=n76A4nTALlSzLiw~v~31J<>9PP?;rs31pu_(obw)r zY+jPY;tVGXi|p)da{-@gE-UCa`=5eu%D;v=_nFJ?`&K)q7e9d`Nfk3?MdhZarb|T3 z%nS~f&t(1g5dY)AIcd$w!z`Siz!&j_=v7hZlnI21XuE|xfmo0(WD10T)!}~_HYW!e zew}L+XmwuzeT6wtxJd`dZ#@7*BLgIEKY9Xv>st^p3dp{^Xswa2bB{85{^$B13tWnB z;Y>jyQ|9&zk7RNsqAVGs--K+z0uqo1bf5|}fi5rtEMN^BfHQCd-XH*kfJhJnmIE$G z0%<@5vOzxB0181d*a3EfYH$G5fqKvcPJ%XY23!PJzzuK<41h;K3WmW;Fah3yX$XSw z5EY_9s*o0>51B&N5F1(uc|$=^I1~fLLy3?Ol0f;;Ca4%HgQ}rJP(Ab`bQ-z{U4#0d z2hboi2K@njgb|nm(_szR0JebHusa+GN5aeCM0gdP2N%HG;Yzp`J`T6S7vUT504#-H z!jlL<$Or?`Mpy_N@kBz9SR?@vA#0H$qyni$nvf2p8@Y{0k#Xb$28W?xm>3qu8RLgp zjNxKdVb)?wFx8l2m{v>|<~C*!GlBVnrDD~wrdTJeKXwT=5u1%I#8zOBU|X=4u>;s) z>^mF|$G{ol9B_WP7+f-LHLe7=57&&lfa}8z;U@8Tyei%l?}87(bMRt(A-)QK9Dg3) zj~~XrCy)tR1Z#p1A(kK{Y$Q|=8VKhI{e%(1G*N-5Pjn)N5P8I0VkxnX*g?EW941ba z6iJ387g8iCnY4jaNopcpCOsy-A(P2EWJhusSwLP-t|XrzUnLKcKTwn?CKOLf97RIe zPB}`sKzTrUL#0v;sBY9)s+hW+T2H-1eM)^VN0T#`^Oxhvt&^*fYnAJldnHel*Ozyf zUoM{~Um<@={-*r60#U(0!Bc^wuvVc);k3d%g-J!4qLpHZVwz%!VuRu}#Ze`^l7W)9 z5>Kf>>9Eozr6C$Z)1`URxU@~QI@)F0FdauXr2Es8>BaOP=)Lp_WhG@>R;lZ?BJkMlIuMhw8ApiF&yDYW2hFJ?fJhni{?u z85&g@mo&yT8JcdI$(rSw=QPK(Xj%)k1X|@<=e1rim6`6$RAwc!i#egKuI;BS(LSWz zt39n_sIypSqfWEV6J3%nTQ@-4i zi$R;gsG*9XzhRzXqv2yCs*$VFDx+GXJH|L;wsDH_KI2;^u!)^Xl1YupO;gy^-c(?^ z&$Q1BYvyPsG^;hc$D**@Sy`+`)}T4VJji^bd7Jqw3q6Zii=7tT7GEswEK@D(EFW1Z zSp`^awCb?>!`j4}Yh7b~$A)U-W3$et-R8BesV(1jzwLcHnq9En7Q0Tn&-M=XBKs!$ zF$X<|c!#|X_tWYh)GZit z(Q)Cp9CDE^WG;+fcyOWARoj*0TI>4EP1lX*cEoMO-Pk?Z{kZ!p4@(b`M~lalr<3Oz z&kJ6Nm#vN_+kA5{dW4@^Vjg_`q%qU1ULk& z3Fr!>1V#i_2R;ij2@(Z$1jE4r!MlPVFVbHmT+|iPIq0wy5aS{>yK?9ZAjVh%SOwMWgFjair&;wpi!{CU}&@N=Eg#~ zLQ&zpEzVmGY{hI9Z0+4-0xS$$Xe-OToc?Y*V;rTcf_ zb_jRe-RZjXSeas3UfIyD;9afd%<`i0x4T#DzE)vdabOQ=k7SRuGN`h>O0Q~1)u-yD z>VX=Mn&!Rgd$;YK+Q-}1zu#?t(*cbG#Ronf6db&N$oEidtwC+YVcg-Y!_VuY>bk#Y ze_ww@?MU&F&qswvrN_dLb=5o6*Egs)ls3YRlE$&)amR1{;Ppd$6RYV^Go!iq1UMl% z@#4q$AMc(FJlT1QeX8jv{h#)>&{~RGq1N2iiMFIRX?sk2-|2wUogK~{EkB$8eDsX= znVPf8XG_nK&J~=SIiGia@9y}|z3FhX{g&gcj=lwb=lWgyFW&aLedUh- zof`v-2Kw$UzI*>(+&$@i-u=-BsSjR1%z8NeX#HdC`Hh-Z(6xI-`hmHDqv!v)W&&nrf>M(RhcN6(D;jNN*%^u_SYjF;2ng}*8Ow)d6M ztDk;%`@Lsk$;9w$(d(H%O5UixIr`T2ZRcd@F6%J_H!?`LLp*;y(`g z#*U7T1{`w43uChYBnHIKfS4!?n25Iyq4M9qe~v(28ZnlTWkFY0*G-Tm|Ns9_Cu9j( z761+X&&0%ZgOQO@0_c-^gx^SHfea#~g^(Jud_c%jWcg7GkV6A2do+l!1`Dzv3o-{A jn@~E(re{=agoOYAxMwN3uqm5J00000NkvXXu0mjf@}YIa literal 0 HcwPel00001 diff --git a/chrome/app/theme/default_100_percent/common/location_bar_http.png b/components/resources/default_100_percent/omnibox/location_bar_http.png similarity index 100% rename from chrome/app/theme/default_100_percent/common/location_bar_http.png rename to components/resources/default_100_percent/omnibox/location_bar_http.png diff --git a/components/resources/default_200_percent/omnibox/ios/location_bar_http.png b/components/resources/default_200_percent/omnibox/ios/location_bar_http.png new file mode 100644 index 0000000000000000000000000000000000000000..da5ee69ea17e03ccaeb63157f8317049106fe3c8 GIT binary patch literal 2912 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 rd2fuS9`LyekX + @@ -11,6 +12,7 @@ + -- 2.11.4.GIT