12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092 |
- From: csagan5 <32685696+csagan5@users.noreply.github.com>
- Date: Tue, 12 Jun 2018 14:23:07 +0200
- Subject: Remove signin and sync integrations
- Prevents authorization prompt for Play services on reboot
- Remove recent tabs signin
- Disable unused permissions from manifest
- Disable sync adaptive and invalidation services from manifest
- More permissions removal from manifest
- Disable promos displayed in bookmarks manager
- Remove personalized signin promo view from
- bookmarks, never reach signin thresholds.
- Fix building with debug symbols:
- ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
- >>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
- >>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
- License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
- ---
- chrome/android/BUILD.gn | 26 ---
- chrome/android/chrome_java_sources.gni | 34 ---
- .../features/autofill_assistant/BUILD.gn | 1 -
- .../AssistantAccessTokenUtilChrome.java | 14 --
- .../AssistantDependencyUtilsChrome.java | 4 +-
- .../AssistantProfileImageUtilChrome.java | 25 +--
- .../AssistantStaticDependenciesChrome.java | 12 +-
- .../public/java_sources.gni | 1 -
- chrome/android/features/tab_ui/BUILD.gn | 1 -
- .../PriceTrackingUtilities.java | 15 +-
- .../TabSuggestionsServerFetcher.java | 12 +-
- .../browser/feed/FeedSurfaceCoordinator.java | 26 +--
- .../browser/feed/FeedSurfaceMediator.java | 95 +-------
- chrome/android/java/AndroidManifest.xml | 19 --
- .../res/xml/google_services_preferences.xml | 5 -
- .../android/java/res/xml/main_preferences.xml | 22 +-
- .../java/res/xml/manage_sync_preferences.xml | 12 -
- .../java/res/xml/privacy_preferences.xml | 4 -
- .../org/chromium/chrome/browser/AppHooks.java | 26 ---
- .../chrome/browser/ChromeBackupAgentImpl.java | 9 +-
- .../chrome/browser/ChromeBackupWatcher.java | 12 -
- .../chrome/browser/ChromeTabbedActivity.java | 19 --
- .../chrome/browser/app/ChromeActivity.java | 76 -------
- .../AutofillAssistantPreferenceFragment.java | 17 +-
- .../bookmarks/BookmarkItemsAdapter.java | 49 +----
- .../bookmarks/BookmarkPromoHeader.java | 207 +-----------------
- .../ClearBrowsingDataFragmentBasic.java | 33 +--
- .../contacts_picker/ChromePickerAdapter.java | 62 +-----
- .../browser/customtabs/CustomTabActivity.java | 3 -
- .../browser/firstrun/FirstRunActivity.java | 2 +-
- .../firstrun/FirstRunActivityBase.java | 1 -
- .../firstrun/FirstRunFlowSequencer.java | 10 +-
- .../firstrun/FirstRunPageDelegate.java | 5 -
- .../firstrun/LightweightFirstRunActivity.java | 6 +-
- ...FirstRunFragmentWithEnterpriseSupport.java | 6 -
- .../history/HistoryContentManager.java | 26 +--
- .../identity_disc/IdentityDiscController.java | 131 +----------
- .../browser/infobar/SavePasswordInfoBar.java | 15 +-
- .../infobar/UpdatePasswordInfoBar.java | 17 +-
- .../init/ChromeBrowserInitializer.java | 2 -
- .../init/ProcessInitializationHandler.java | 7 -
- .../chrome/browser/ntp/RecentTabsManager.java | 114 +---------
- .../browser/ntp/RecentTabsRowAdapter.java | 54 -----
- .../browser/ntp/search/SearchBoxMediator.java | 1 -
- .../browser/omaha/RequestGenerator.java | 3 -
- .../AccountChooserDialog.java | 2 +-
- .../PasswordManagerLauncher.java | 15 +-
- .../settings/PasswordSettings.java | 71 +-----
- .../browser/payments/ui/PaymentRequestUI.java | 10 -
- .../privacy/settings/PrivacySettings.java | 31 ---
- .../chrome/browser/settings/MainSettings.java | 125 +----------
- .../browser/settings/SettingsActivity.java | 13 +-
- .../SharedClipboardShareActivity.java | 3 -
- .../tabbed_mode/TabbedRootUiCoordinator.java | 19 --
- .../browser/tasks/ReturnToChromeUtil.java | 9 +-
- chrome/browser/BUILD.gn | 150 -------------
- .../chrome_autocomplete_provider_client.cc | 21 +-
- .../chrome_autocomplete_provider_client.h | 1 -
- .../document_suggestions_service_factory.cc | 6 +-
- .../autofill/personal_data_manager_factory.cc | 4 +-
- .../common_dependencies_chrome.cc | 13 --
- .../common_dependencies_chrome.h | 3 -
- .../chrome_browsing_data_lifetime_manager.cc | 6 +-
- .../counters/browsing_data_counter_utils.cc | 6 -
- chrome/browser/chrome_browser_field_trials.cc | 6 +-
- .../endpoint_fetcher/endpoint_fetcher.cc | 2 +-
- .../profile_report_generator_delegate_base.cc | 11 -
- ...tory_ui_favicon_request_handler_factory.cc | 1 -
- chrome/browser/feed/android/BUILD.gn | 1 -
- .../chrome/browser/feed/FeedFeatures.java | 2 -
- chrome/browser/feed/feed_service_factory.cc | 6 +-
- .../browser/firstrun/MobileFreProgress.java | 4 +-
- .../gcm/gcm_profile_service_factory.cc | 4 +-
- .../profile_invalidation_provider_factory.cc | 48 +---
- .../router/discovery/access_code/BUILD.gn | 1 -
- .../metrics/chrome_metrics_service_client.cc | 6 -
- .../browser/password_manager/android/BUILD.gn | 6 -
- .../PasswordManagerHelper.java | 94 +-------
- ...swordSyncControllerDelegateBridgeImpl.java | 7 -
- .../chrome_password_manager_client.cc | 120 +---------
- .../chrome_password_manager_client.h | 25 ---
- ...ssword_manager_settings_service_factory.cc | 6 -
- chrome/browser/privacy/BUILD.gn | 2 -
- .../res/layout/privacy_review_msbb_step.xml | 8 -
- chrome/browser/profiles/profile_impl.cc | 15 +-
- .../verdict_cache_manager_factory.cc | 5 +-
- .../DevicePickerBottomSheetContent.java | 46 ----
- .../SendTabToSelfCoordinator.java | 104 +--------
- .../android/infobars/save_password_infobar.cc | 5 +-
- .../infobars/update_password_infobar.cc | 6 +-
- chrome/browser/ui/android/omnibox/BUILD.gn | 2 -
- .../browser/omnibox/LocationBarMediator.java | 1 -
- .../strings/android_chrome_strings.grd | 18 --
- .../AssistantStaticDependencies.java | 3 -
- .../browser/android/dependencies_android.cc | 7 -
- .../browser/common_dependencies.h | 3 -
- .../browser/headless/client_headless.cc | 17 --
- .../browser/headless/client_headless.h | 1 -
- .../browser/autocomplete_provider_client.h | 7 -
- .../password_manager/core/browser/BUILD.gn | 9 -
- .../core/browser/leak_detection_delegate.cc | 2 +-
- .../core/browser/password_form_manager.cc | 34 +--
- .../core/browser/password_manager.cc | 82 -------
- .../core/browser/password_manager_client.h | 20 --
- .../browser/password_manager_client_helper.cc | 43 +---
- .../core/browser/sync_credentials_filter.cc | 48 +---
- components/signin/features.gni | 4 +-
- .../signin/SystemAccountManagerDelegate.java | 25 +--
- .../net/HttpNegotiateAuthenticator.java | 88 +-------
- .../chromoting/base/OAuthTokenFetcher.java | 2 -
- 110 files changed, 90 insertions(+), 2616 deletions(-)
- diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
- --- a/chrome/android/BUILD.gn
- +++ b/chrome/android/BUILD.gn
- @@ -226,14 +226,12 @@ android_resources("chrome_app_java_resources") {
- "//chrome/browser/lens:java_resources",
- "//chrome/browser/password_check/android:java_resources",
- "//chrome/browser/password_manager/android:java_resources",
- - "//chrome/browser/signin/services/android:java_resources",
- "//chrome/browser/tab:java_resources",
- "//chrome/browser/ui/android/appmenu:java_resources",
- "//chrome/browser/ui/android/favicon:java_resources",
- "//chrome/browser/ui/android/management:java_resources",
- "//chrome/browser/ui/android/omnibox:java_resources",
- "//chrome/browser/ui/android/quickactionsearchwidget:java_resources",
- - "//chrome/browser/ui/android/signin:java_resources",
- "//chrome/browser/ui/android/strings:ui_strings_grd",
- "//chrome/browser/ui/android/theme:java_resources",
- "//chrome/browser/ui/android/toolbar:java_resources",
- @@ -422,8 +420,6 @@ android_library("chrome_java") {
- "//chrome/browser/settings:java",
- "//chrome/browser/share:java",
- "//chrome/browser/share/android:java_resources",
- - "//chrome/browser/signin/services/android:java",
- - "//chrome/browser/sync/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/tab_group:java",
- "//chrome/browser/tabmodel:factory_java",
- @@ -446,7 +442,6 @@ android_library("chrome_java") {
- "//chrome/browser/ui/android/page_info:java",
- "//chrome/browser/ui/android/quickactionsearchwidget:java",
- "//chrome/browser/ui/android/searchactivityutils:java",
- - "//chrome/browser/ui/android/signin:java",
- "//chrome/browser/ui/android/theme:java",
- "//chrome/browser/ui/android/toolbar:java",
- "//chrome/browser/ui/messages/android:java",
- @@ -561,7 +556,6 @@ android_library("chrome_java") {
- "//components/security_state/core:security_state_enums_java",
- "//components/segmentation_platform/public:public_java",
- "//components/signin/core/browser:signin_enums_java",
- - "//components/signin/public/android:java",
- "//components/site_engagement/content/android:java",
- "//components/spellcheck/browser/android:java",
- "//components/strictmode/android:java",
- @@ -814,7 +808,6 @@ java_group("chrome_all_java") {
- group("jni_headers") {
- public_deps = [
- ":chrome_jni_headers",
- - "//chrome/android/features/autofill_assistant:jni_headers_public",
- "//chrome/android/features/keyboard_accessory:jni_headers",
- "//chrome/android/features/start_surface:jni_headers",
- "//chrome/browser/android/browserservices/metrics:jni_headers",
- @@ -1029,9 +1022,6 @@ junit_binary("chrome_junit_tests") {
- "//chrome/browser/safety_check/android:junit",
- "//chrome/browser/search_engines/android:java",
- "//chrome/browser/share:java",
- - "//chrome/browser/signin/services/android:java",
- - "//chrome/browser/signin/services/android:junit",
- - "//chrome/browser/sync/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/tab:junit",
- "//chrome/browser/tab_group:java",
- @@ -1062,8 +1052,6 @@ junit_binary("chrome_junit_tests") {
- "//chrome/browser/ui/android/omnibox:junit",
- "//chrome/browser/ui/android/quickactionsearchwidget:java",
- "//chrome/browser/ui/android/searchactivityutils:java",
- - "//chrome/browser/ui/android/signin:java",
- - "//chrome/browser/ui/android/signin:junit",
- "//chrome/browser/ui/android/theme:java",
- "//chrome/browser/ui/android/toolbar:java",
- "//chrome/browser/ui/android/toolbar:junit",
- @@ -1132,7 +1120,6 @@ junit_binary("chrome_junit_tests") {
- "//components/security_state/content/android:java",
- "//components/security_state/core:security_state_enums_java",
- "//components/signin/core/browser:signin_enums_java",
- - "//components/signin/public/android:java",
- "//components/signin/public/android:signin_java_test_support",
- "//components/sync/android:sync_java",
- "//components/ukm/android:java",
- @@ -1451,9 +1438,6 @@ android_library("chrome_test_java") {
- "//chrome/browser/settings:test_support_java",
- "//chrome/browser/share:java",
- "//chrome/browser/share/android:java_resources",
- - "//chrome/browser/signin/services/android:java",
- - "//chrome/browser/signin/services/android:javatests",
- - "//chrome/browser/sync/android:java",
- "//chrome/browser/sync/test/android:test_support_java",
- "//chrome/browser/tab:critical_persisted_tab_data_flatbuffer_java",
- "//chrome/browser/tab:critical_persisted_tab_data_proto_java",
- @@ -1482,8 +1466,6 @@ android_library("chrome_test_java") {
- "//chrome/browser/ui/android/quickactionsearchwidget:javatests",
- "//chrome/browser/ui/android/searchactivityutils:java",
- "//chrome/browser/ui/android/searchactivityutils:javatests",
- - "//chrome/browser/ui/android/signin:java",
- - "//chrome/browser/ui/android/signin:javatests",
- "//chrome/browser/ui/android/theme:java",
- "//chrome/browser/ui/android/toolbar:java",
- "//chrome/browser/ui/android/toolbar:javatests",
- @@ -1603,7 +1585,6 @@ android_library("chrome_test_java") {
- "//components/security_state/content/android:java",
- "//components/security_state/core:security_state_enums_java",
- "//components/signin/core/browser:signin_enums_java",
- - "//components/signin/public/android:java",
- "//components/signin/public/android:javatests",
- "//components/signin/public/android:signin_java_test_support",
- "//components/site_engagement/content/android:java",
- @@ -2432,7 +2413,6 @@ android_library("browser_java_test_support") {
- "//chrome/browser/download/android:java",
- "//chrome/browser/prefetch/android:java",
- "//chrome/browser/profiles/android:java",
- - "//chrome/browser/sync/android:java",
- "//chrome/browser/tab:java",
- "//components/offline_items_collection/core:core_java",
- "//components/sync/protocol:protocol_java",
- @@ -3924,7 +3904,6 @@ generate_jni("chrome_jni_headers") {
- "java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
- - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
- "java/src/org/chromium/chrome/browser/init/NativeStartupBridge.java",
- @@ -3965,9 +3944,6 @@ generate_jni("chrome_jni_headers") {
- "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTask.java",
- "java/src/org/chromium/chrome/browser/offlinepages/prefetch/PrefetchBackgroundTaskScheduler.java",
- "java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java",
- - "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
- - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
- - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
- "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
- "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
- "java/src/org/chromium/chrome/browser/password_manager/PasswordChangeLauncher.java",
- @@ -3998,8 +3974,6 @@ generate_jni("chrome_jni_headers") {
- "java/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandler.java",
- "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMessageHandler.java",
- "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
- "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
- "java/src/org/chromium/chrome/browser/status_indicator/StatusIndicatorSceneLayer.java",
- "java/src/org/chromium/chrome/browser/suggestions/mostvisited/MostVisitedSites.java",
- diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
- --- a/chrome/android/chrome_java_sources.gni
- +++ b/chrome/android/chrome_java_sources.gni
- @@ -536,7 +536,6 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/findinpage/FindToolbarObserver.java",
- "java/src/org/chromium/chrome/browser/findinpage/FindToolbarPhone.java",
- "java/src/org/chromium/chrome/browser/findinpage/FindToolbarTablet.java",
- - "java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java",
- "java/src/org/chromium/chrome/browser/firstrun/DefaultSearchEngineFirstRunFragment.java",
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java",
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java",
- @@ -547,14 +546,11 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunPage.java",
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java",
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunPagerAdapter.java",
- - "java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java",
- "java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java",
- - "java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java",
- "java/src/org/chromium/chrome/browser/firstrun/FreIntentCreator.java",
- "java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java",
- "java/src/org/chromium/chrome/browser/firstrun/PolicyLoadListener.java",
- "java/src/org/chromium/chrome/browser/firstrun/SkipTosDialogPolicyListener.java",
- - "java/src/org/chromium/chrome/browser/firstrun/SyncConsentFirstRunFragment.java",
- "java/src/org/chromium/chrome/browser/firstrun/TabbedModeFirstRunActivity.java",
- "java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java",
- "java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java",
- @@ -644,7 +640,6 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/infobar/SubPanelListener.java",
- "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/SurveyInfoBarDelegate.java",
- - "java/src/org/chromium/chrome/browser/infobar/SyncErrorInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/TextViewEllipsizerSafe.java",
- "java/src/org/chromium/chrome/browser/infobar/TranslateCompactInfoBar.java",
- "java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java",
- @@ -758,7 +753,6 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/ntp/RevampedIncognitoDescriptionView.java",
- "java/src/org/chromium/chrome/browser/ntp/SnapScrollHelperImpl.java",
- "java/src/org/chromium/chrome/browser/ntp/TitleUtil.java",
- - "java/src/org/chromium/chrome/browser/ntp/cards/SignInPromo.java",
- "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxContainerView.java",
- "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxCoordinator.java",
- "java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java",
- @@ -822,8 +816,6 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/paint_preview/StartupPaintPreviewHelperSupplier.java",
- "java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java",
- "java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java",
- - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninFirstRunDialog.java",
- - "java/src/org/chromium/chrome/browser/password_manager/AutoSigninSnackbarController.java",
- "java/src/org/chromium/chrome/browser/password_manager/Credential.java",
- "java/src/org/chromium/chrome/browser/password_manager/CredentialLeakDialogBridge.java",
- "java/src/org/chromium/chrome/browser/password_manager/GooglePasswordManagerUIProvider.java",
- @@ -961,14 +953,6 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
- "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
- "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninBridge.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninCheckerProvider.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninFirstRunFragment.java",
- - "java/src/org/chromium/chrome/browser/signin/SigninManagerImpl.java",
- - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
- - "java/src/org/chromium/chrome/browser/signin/SyncConsentActivityLauncherImpl.java",
- - "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
- - "java/src/org/chromium/chrome/browser/signin/SyncPromoView.java",
- "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
- "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
- "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
- @@ -1004,26 +988,8 @@ chrome_java_sources = [
- "java/src/org/chromium/chrome/browser/suggestions/tile/TileRenderer.java",
- "java/src/org/chromium/chrome/browser/suggestions/tile/TopSitesTileView.java",
- "java/src/org/chromium/chrome/browser/supervised_user/ChildAccountFeedbackReporter.java",
- - "java/src/org/chromium/chrome/browser/survey/ChromeSurveyController.java",
- "java/src/org/chromium/chrome/browser/survey/SurveyController.java",
- "java/src/org/chromium/chrome/browser/survey/SurveyHttpClientBridge.java",
- - "java/src/org/chromium/chrome/browser/sync/SyncErrorNotifier.java",
- - "java/src/org/chromium/chrome/browser/sync/TrustedVaultClient.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/ClearDataProgressDialog.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/SignInPreference.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/SyncErrorCardPreference.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/SyncPromoPreference.java",
- - "java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseActivity.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseCreationDialogFragment.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseDialogFragment.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/PassphraseTypeDialogFragment.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorMessage.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/SyncErrorPromptUtils.java",
- - "java/src/org/chromium/chrome/browser/sync/ui/SyncTrustedVaultProxyActivity.java",
- "java/src/org/chromium/chrome/browser/tab/AccessibilityVisibilityHandler.java",
- "java/src/org/chromium/chrome/browser/tab/AuthenticatorNavigationInterceptorTabHelper.java",
- "java/src/org/chromium/chrome/browser/tab/AutofillSessionLifetimeController.java",
- diff --git a/chrome/android/features/autofill_assistant/BUILD.gn b/chrome/android/features/autofill_assistant/BUILD.gn
- --- a/chrome/android/features/autofill_assistant/BUILD.gn
- +++ b/chrome/android/features/autofill_assistant/BUILD.gn
- @@ -125,7 +125,6 @@ android_library("test_java") {
- "//chrome/browser/password_manager/android:java",
- "//chrome/browser/preferences:java",
- "//chrome/browser/profiles/android:java",
- - "//chrome/browser/signin/services/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/tabmodel:java",
- "//chrome/browser/ui/android/omnibox:java",
- diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
- --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
- +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java
- @@ -6,10 +6,7 @@ package org.chromium.chrome.browser.autofill_assistant;
-
- import android.accounts.Account;
-
- -import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
-
- /**
- * Implementation of {@link AssistantAccessTokenUtil} for Chrome.
- @@ -19,18 +16,7 @@ public class AssistantAccessTokenUtilChrome implements AssistantAccessTokenUtil
- private static final String AUTH_TOKEN_TYPE =
- "oauth2:https://www.googleapis.com/auth/userinfo.profile";
-
- - @Override
- - public void getAccessToken(Account account, IdentityManager.GetAccessTokenCallback callback) {
- - getIdentityManager().getAccessToken(account, AUTH_TOKEN_TYPE, callback);
- - }
- -
- @Override
- public void invalidateAccessToken(String accessToken) {
- - getIdentityManager().invalidateAccessToken(accessToken);
- - }
- -
- - private IdentityManager getIdentityManager() {
- - return IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- }
- }
- diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
- --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
- +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantDependencyUtilsChrome.java
- @@ -14,7 +14,6 @@ import org.chromium.chrome.browser.IntentHandler;
- import org.chromium.chrome.browser.IntentHandler.ExternalAppId;
- import org.chromium.chrome.browser.flags.ActivityType;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
- import org.chromium.chrome.browser.tab.EmptyTabObserver;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.components.autofill_assistant.AssistantFeatures;
- @@ -88,8 +87,7 @@ public class AssistantDependencyUtilsChrome {
- }
-
- public static boolean isMakeSearchesAndBrowsingBetterSettingEnabled() {
- - return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
- - Profile.getLastUsedRegularProfile());
- + return false;
- }
-
- private AssistantDependencyUtilsChrome() {}
- diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
- --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
- +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantProfileImageUtilChrome.java
- @@ -10,49 +10,26 @@ import android.graphics.drawable.Drawable;
- import androidx.annotation.DimenRes;
-
- import org.chromium.base.ObserverList;
- -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
- import org.chromium.components.autofill_assistant.AssistantProfileImageUtil;
-
- /**
- * Implementation of {@link AssistantProfileImageUtil} for Chrome.
- */
- public class AssistantProfileImageUtilChrome
- - implements AssistantProfileImageUtil, ProfileDataCache.Observer {
- + implements AssistantProfileImageUtil {
- private final String mSignedInAccountEmail;
- - private final ProfileDataCache mProfileCache;
- private final ObserverList<Observer> mObservers = new ObserverList<>();
-
- public AssistantProfileImageUtilChrome(
- Context context, String signedInAccountEmail, @DimenRes int imageSizeRedId) {
- mSignedInAccountEmail = signedInAccountEmail;
- - mProfileCache = ProfileDataCache.createWithoutBadge(context, imageSizeRedId);
- }
-
- @Override
- public void addObserver(Observer observer) {
- - if (mObservers.isEmpty() && mObservers.addObserver(observer)) {
- - mProfileCache.addObserver(this);
- - }
- }
-
- @Override
- public void removeObserver(Observer observer) {
- - if (mObservers.removeObserver(observer) && mObservers.isEmpty()) {
- - mProfileCache.removeObserver(this);
- - }
- - }
- -
- - @Override
- - public void onProfileDataUpdated(String accountEmail) {
- - if (!mSignedInAccountEmail.equals(accountEmail)) {
- - return;
- - }
- -
- - Drawable profileImage =
- - mProfileCache.getProfileDataOrDefault(mSignedInAccountEmail).getImage();
- -
- - for (Observer observer : mObservers) {
- - observer.onProfileImageChanged(profileImage);
- - }
- }
- }
- diff --git a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
- --- a/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
- +++ b/chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantStaticDependenciesChrome.java
- @@ -13,11 +13,9 @@ import androidx.annotation.Nullable;
- import org.chromium.base.annotations.JNINamespace;
- import org.chromium.base.annotations.NativeMethods;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.ui.TabObscuringHandler;
- import org.chromium.chrome.browser.ui.TabObscuringHandlerSupplier;
- import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
- -import org.chromium.components.autofill_assistant.AssistantAccessTokenUtil;
- import org.chromium.components.autofill_assistant.AssistantDependencies;
- import org.chromium.components.autofill_assistant.AssistantEditorFactory;
- import org.chromium.components.autofill_assistant.AssistantFeedbackUtil;
- @@ -92,11 +90,6 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende
- return new AssistantSettingsUtilChrome();
- }
-
- - @Override
- - public AssistantAccessTokenUtil createAccessTokenUtil() {
- - return new AssistantAccessTokenUtilChrome();
- - }
- -
- /**
- * Getter for the current profile while assistant is running. Since autofill assistant is only
- * available in regular mode and there is only one regular profile in android, this method
- @@ -129,10 +122,7 @@ public class AssistantStaticDependenciesChrome implements AssistantStaticDepende
-
- @Nullable
- public String getSignedInAccountEmailOrNull() {
- - IdentityManager identityManager =
- - IdentityServicesProvider.get().getIdentityManager(getProfile());
- - return CoreAccountInfo.getEmailFrom(
- - identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC));
- + return null;
- }
-
- @Override
- diff --git a/chrome/android/features/autofill_assistant/public/java_sources.gni b/chrome/android/features/autofill_assistant/public/java_sources.gni
- --- a/chrome/android/features/autofill_assistant/public/java_sources.gni
- +++ b/chrome/android/features/autofill_assistant/public/java_sources.gni
- @@ -3,7 +3,6 @@
- # found in the LICENSE file.
-
- public_autofill_assistant_java_sources = [
- - "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAccessTokenUtilChrome.java",
- "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAddressEditorAutofill.java",
- "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantAutofillUtilChrome.java",
- "//chrome/android/features/autofill_assistant/public/java/src/org/chromium/chrome/browser/autofill_assistant/AssistantBrowserControlsChrome.java",
- diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
- --- a/chrome/android/features/tab_ui/BUILD.gn
- +++ b/chrome/android/features/tab_ui/BUILD.gn
- @@ -189,7 +189,6 @@ android_library("java") {
- "//chrome/browser/profiles/android:java",
- "//chrome/browser/search_engines/android:java",
- "//chrome/browser/share:java",
- - "//chrome/browser/signin/services/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/tab_group:java",
- "//chrome/browser/tabmodel:java",
- diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
- --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
- +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/PriceTrackingUtilities.java
- @@ -12,12 +12,8 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.price_tracking.PriceDropNotificationManager;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceConfig;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.chrome.browser.tabmodel.TabModel;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.components.sync.ModelType;
-
- import java.util.concurrent.TimeUnit;
- @@ -212,20 +208,15 @@ public class PriceTrackingUtilities {
- }
-
- private static boolean isSignedIn() {
- - return IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .hasPrimaryAccount(ConsentLevel.SYNC);
- + return false;
- }
-
- private static boolean isOpenTabsSyncEnabled() {
- - SyncService syncService = SyncService.get();
- - return syncService != null && syncService.isSyncRequested()
- - && syncService.getActiveDataTypes().contains(ModelType.SESSIONS);
- + return false;
- }
-
- private static boolean isAnonymizedUrlDataCollectionEnabled() {
- - return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
- - Profile.getLastUsedRegularProfile());
- + return false;
- }
-
- @VisibleForTesting
- diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
- --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
- +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java
- @@ -18,9 +18,7 @@ import org.chromium.chrome.browser.endpoint_fetcher.EndpointFetcher;
- import org.chromium.chrome.browser.endpoint_fetcher.EndpointResponse;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.tasks.tab_management.TabUiFeatureUtilities;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.net.NetworkTrafficAnnotationTag;
-
- import java.util.Collections;
- @@ -150,15 +148,7 @@ public class TabSuggestionsServerFetcher implements TabSuggestionsFetcher {
- // avoid fetching server if the TabGroupsAndroid flag is disabled. We need to move this
- // flag checking logic to somewhere if this server fetcher supports suggestions other than
- // grouping in the future.
- - return isSignedIn() && isServerFetcherFlagEnabled()
- - && TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext);
- - }
- -
- - @VisibleForTesting
- - protected boolean isSignedIn() {
- - return IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .hasPrimaryAccount(ConsentLevel.SYNC);
- + return false;
- }
-
- @VisibleForTesting
- diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
- --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
- +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java
- @@ -48,7 +48,6 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImp
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.chrome.browser.share.ShareDelegate;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabSelectionType;
- import org.chromium.chrome.browser.tabmodel.TabModelObserver;
- @@ -69,7 +68,6 @@ import org.chromium.components.browser_ui.styles.SemanticColorUtils;
- import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
- import org.chromium.components.feature_engagement.EventConstants;
- import org.chromium.components.feature_engagement.Tracker;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.third_party.android.swiperefresh.SwipeRefreshLayout;
- import org.chromium.ui.base.ViewUtils;
- import org.chromium.ui.base.WindowAndroid;
- @@ -707,17 +705,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
- return mSectionHeaderModel;
- }
-
- - /** @return The {@link View} for this class. */
- - View getSigninPromoView() {
- - if (mSigninPromoView == null) {
- - LayoutInflater inflater = LayoutInflater.from(mRootView.getContext());
- - mSigninPromoView = inflater.inflate(
- - R.layout.personalized_signin_promo_view_modern_content_suggestions, mRootView,
- - false);
- - }
- - return mSigninPromoView;
- - }
- -
- /**
- * Update header views in the Feed.
- */
- @@ -731,9 +718,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
-
- headers.add(mSectionHeaderView);
-
- - if (isSignInPromoVisible) {
- - headers.add(getSigninPromoView());
- - }
- setHeaders(headers);
- }
-
- @@ -742,11 +726,6 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
- return mMediator;
- }
-
- - @VisibleForTesting
- - public View getSignInPromoViewForTesting() {
- - return getSigninPromoView();
- - }
- -
- @VisibleForTesting
- public View getSectionHeaderViewForTesting() {
- return mSectionHeaderView;
- @@ -843,10 +822,7 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider, FeedBubbleDe
-
- @Override
- public boolean isSignedIn() {
- - return IdentityServicesProvider.get()
- - .getSigninManager(Profile.getLastUsedRegularProfile())
- - .getIdentityManager()
- - .hasPrimaryAccount(ConsentLevel.SYNC);
- + return false;
- }
-
- @Override
- diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
- --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
- +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
- @@ -34,17 +34,12 @@ import org.chromium.chrome.browser.feed.sort_ui.FeedOptionsCoordinator;
- import org.chromium.chrome.browser.feed.v2.FeedUserActionType;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
- -import org.chromium.chrome.browser.ntp.cards.SignInPromo;
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.SigninManager;
- import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
- import org.chromium.chrome.browser.ui.native_page.TouchEnabledDelegate;
- -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
- import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger;
- import org.chromium.chrome.browser.xsurface.FeedLaunchReliabilityLogger.StreamType;
- import org.chromium.components.browser_ui.widget.listmenu.ListMenu;
- @@ -52,10 +47,6 @@ import org.chromium.components.browser_ui.widget.listmenu.ListMenuItemProperties
- import org.chromium.components.feed.proto.wire.ReliabilityLoggingEnums.DiscoverLaunchResult;
- import org.chromium.components.prefs.PrefService;
- import org.chromium.components.search_engines.TemplateUrlService.TemplateUrlServiceObserver;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
- -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
- -import org.chromium.components.signin.metrics.SigninAccessPoint;
- import org.chromium.components.user_prefs.UserPrefs;
- import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.ui.modelutil.MVCListAdapter;
- @@ -75,7 +66,7 @@ import java.util.Locale;
- @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
- public class FeedSurfaceMediator
- implements FeedSurfaceScrollDelegate, TouchEnabledDelegate, TemplateUrlServiceObserver,
- - ListMenu.Delegate, IdentityManager.Observer {
- + ListMenu.Delegate {
- private static final String TAG = "FeedSurfaceMediator";
- private static final int INTEREST_FEED_HEADER_POSITION = 0;
-
- @@ -130,50 +121,6 @@ public class FeedSurfaceMediator
- }
- }
-
- - /**
- - * The {@link SignInPromo} for the Feed.
- - * TODO(huayinz): Update content and visibility through a ModelChangeProcessor.
- - */
- - private class FeedSignInPromo extends SignInPromo {
- - FeedSignInPromo(SigninManager signinManager) {
- - super(signinManager);
- - maybeUpdateSignInPromo();
- - }
- -
- - @Override
- - protected void setVisibilityInternal(boolean visible) {
- - if (isVisible() == visible) return;
- -
- - super.setVisibilityInternal(visible);
- - mCoordinator.updateHeaderViews(visible);
- - maybeUpdateSignInPromo();
- - }
- -
- - @Override
- - protected void notifyDataChanged() {
- - maybeUpdateSignInPromo();
- - }
- -
- - /** Update the content displayed in {@link PersonalizedSigninPromoView}. */
- - private void maybeUpdateSignInPromo() {
- - // Only call #setupPromoViewFromCache() if SignInPromo is visible to avoid potentially
- - // blocking the UI thread for several seconds if the accounts cache is not populated
- - // yet.
- - if (isVisible()) {
- - mSigninPromoController.setUpSyncPromoView(mProfileDataCache,
- - mCoordinator.getSigninPromoView().findViewById(
- - R.id.signin_promo_view_container),
- - this::onDismissPromo);
- - }
- - }
- -
- - @Override
- - public void onDismissPromo() {
- - super.onDismissPromo();
- - mCoordinator.updateHeaderViews(false);
- - }
- - }
- -
- @VisibleForTesting
- static void setPrefForTest(PrefChangeRegistrar prefChangeRegistrar, PrefService prefService) {
- sTestPrefChangeRegistar = prefChangeRegistrar;
- @@ -187,7 +134,6 @@ public class FeedSurfaceMediator
- private final Context mContext;
- private final @Nullable SnapScrollHelper mSnapScrollHelper;
- private final PrefChangeRegistrar mPrefChangeRegistrar;
- - private final SigninManager mSigninManager;
- private final PropertyModel mSectionHeaderModel;
- private final FeedActionDelegate mActionDelegate;
- private final FeedOptionsCoordinator mOptionsCoordinator;
- @@ -196,7 +142,6 @@ public class FeedSurfaceMediator
- private final ObserverList<ScrollListener> mScrollListeners = new ObserverList<>();
- private ContentChangedListener mStreamContentChangedListener;
- private MemoryPressureCallback mMemoryPressureCallback;
- - private @Nullable SignInPromo mSignInPromo;
- private RecyclerViewAnimationFinishDetector mRecyclerViewAnimationFinishDetector =
- new RecyclerViewAnimationFinishDetector();
-
- @@ -237,8 +182,6 @@ public class FeedSurfaceMediator
- mCoordinator = coordinator;
- mContext = context;
- mSnapScrollHelper = snapScrollHelper;
- - mSigninManager = IdentityServicesProvider.get().getSigninManager(
- - Profile.getLastUsedRegularProfile());
- mActionDelegate = actionDelegate;
- mOptionsCoordinator = optionsCoordinator;
-
- @@ -394,7 +337,6 @@ public class FeedSurfaceMediator
- mFeedMenuModel = buildMenuItems();
-
- mCoordinator.initializeBubbleTriggering();
- - mSigninManager.getIdentityManager().addObserver(this);
-
- mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, mFeedMenuModel);
- mSectionHeaderModel.set(
- @@ -634,17 +576,7 @@ public class FeedSurfaceMediator
- * @return Whether the SignPromo should be visible.
- */
- private boolean shouldShowSigninPromo() {
- - SigninPromoController.resetNTPSyncPromoLimitsIfHiddenForTooLong();
- - if (!SignInPromo.shouldCreatePromo()
- - || !SigninPromoController.canShowSyncPromo(
- - SigninAccessPoint.NTP_CONTENT_SUGGESTIONS)) {
- - return false;
- - }
- - if (mSignInPromo == null) {
- - mSignInPromo = new FeedSignInPromo(mSigninManager);
- - mSignInPromo.setCanShowPersonalizedSuggestions(isSuggestionsVisible());
- - }
- - return mSignInPromo.isVisible();
- + return false;
- }
-
- /** Clear any dependencies related to the {@link Stream}. */
- @@ -659,11 +591,6 @@ public class FeedSurfaceMediator
- MemoryPressureListener.removeCallback(mMemoryPressureCallback);
- mMemoryPressureCallback = null;
-
- - if (mSignInPromo != null) {
- - mSignInPromo.destroy();
- - mSignInPromo = null;
- - }
- -
- unbindStream();
- for (Stream s : mTabToStreamMap.values()) {
- s.removeOnContentChangedListener(mStreamContentChangedListener);
- @@ -674,7 +601,6 @@ public class FeedSurfaceMediator
-
- mPrefChangeRegistrar.removeObserver(Pref.ARTICLES_LIST_VISIBLE);
- TemplateUrlServiceFactory.get().removeObserver(this);
- - mSigninManager.getIdentityManager().removeObserver(this);
-
- mSectionHeaderModel.get(SectionHeaderListProperties.SECTION_HEADERS_KEY).clear();
-
- @@ -745,9 +671,6 @@ public class FeedSurfaceMediator
- // Update toggleswitch item, which is last item in list.
- mSectionHeaderModel.set(SectionHeaderListProperties.MENU_MODEL_LIST_KEY, buildMenuItems());
-
- - if (mSignInPromo != null) {
- - mSignInPromo.setCanShowPersonalizedSuggestions(suggestionsVisible);
- - }
- if (suggestionsVisible) mCoordinator.getSurfaceLifecycleManager().show();
- mStreamContentChanged = true;
-
- @@ -779,7 +702,7 @@ public class FeedSurfaceMediator
- }
-
- private boolean isSignedIn() {
- - return mSigninManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC);
- + return false;
- }
-
- /**
- @@ -1037,18 +960,6 @@ public class FeedSurfaceMediator
- }
- }
-
- - // IdentityManager.Observer interface.
- -
- - @Override
- - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
- - updateSectionHeader();
- - }
- -
- - @VisibleForTesting
- - public SignInPromo getSignInPromoForTesting() {
- - return mSignInPromo;
- - }
- -
- public void manualRefresh(Callback<Boolean> callback) {
- if (mCurrentStream != null) {
- mCurrentStream.triggerRefresh(callback);
- diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
- --- a/chrome/android/java/AndroidManifest.xml
- +++ b/chrome/android/java/AndroidManifest.xml
- @@ -65,9 +65,7 @@ by a child template that "extends" this file.
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
- - <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
- <uses-permission android:name="android.permission.INTERNET"/>
- - <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
- <uses-permission android:name="android.permission.NFC"/>
- <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
- @@ -78,7 +76,6 @@ by a child template that "extends" this file.
- <uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
- <uses-permission android:name="android.permission.RECORD_AUDIO"/>
- - <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
- <uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
- <uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
- <uses-permission android:name="android.permission.VIBRATE"/>
- @@ -123,8 +120,6 @@ by a child template that "extends" this file.
- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
- <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
-
- - <uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
- -
- {% block extra_uses_permissions %}
- {% endblock %}
-
- @@ -529,15 +524,6 @@ by a child template that "extends" this file.
- TODO(crbug.com/1093292): investigate why
- @android:style/Theme.NoDisplay can't be used here.
- -->
- - <activity android:name="org.chromium.chrome.browser.sync.ui.SyncTrustedVaultProxyActivity"
- - android:theme="@style/Theme.MaterialComponents"
- - android:excludeFromRecents="true"
- - android:exported="false">
- - </activity>
- - <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseActivity"
- - android:theme="@style/Theme.Chromium.Activity"
- - android:autoRemoveFromRecents="true">
- - </activity>
- <activity android:name="org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity"
- android:theme="@style/Theme.BrowserUI.AlertDialog.NoActionBar"
- android:launchMode="singleInstance"
- @@ -570,11 +556,6 @@ by a child template that "extends" this file.
- {{ self.supports_vr() }}
- </activity>
- {% endif %}
- - <activity android:name="org.chromium.chrome.browser.signin.SyncConsentActivity"
- - android:theme="@style/Theme.Chromium.DialogWhenLarge"
- - android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
- - android:exported="false">
- - </activity>
- <activity android:name="org.chromium.chrome.browser.settings.SettingsActivity"
- android:theme="@style/Theme.Chromium.Settings"
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
- diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
- --- a/chrome/android/java/res/xml/google_services_preferences.xml
- +++ b/chrome/android/java/res/xml/google_services_preferences.xml
- @@ -24,11 +24,6 @@
- android:title="@string/autocomplete_searches_and_urls_title"
- android:summary="@string/autocomplete_searches_and_urls_summary"
- android:persistent="false"/>
- - <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- - android:key="url_keyed_anonymized_data"
- - android:title="@string/url_keyed_anonymized_data_title"
- - android:summary="@string/url_keyed_anonymized_data_summary"
- - android:persistent="false"/>
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- android:key="autofill_assistant"
- android:title="@string/prefs_autofill_assistant_title"
- diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
- --- a/chrome/android/java/res/xml/main_preferences.xml
- +++ b/chrome/android/java/res/xml/main_preferences.xml
- @@ -7,29 +7,11 @@
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:orderingFromXml="false">
-
- - <org.chromium.chrome.browser.sync.settings.SyncPromoPreference
- - android:key="sync_promo"
- - android:order="0"/>
- <PreferenceCategory
- android:key="account_and_google_services_section"
- android:order="1"
- - android:title="@string/prefs_section_account_and_google_services"/>
- - <org.chromium.chrome.browser.sync.settings.SignInPreference
- - android:key="sign_in"
- - android:order="2"
- - android:title="@string/sign_in_to_chrome"/>
- - <org.chromium.components.browser_ui.settings.ChromeBasePreference
- - android:key="manage_sync"
- - android:order="3"
- - android:layout="@layout/account_management_account_row"
- - android:title="@string/sync_category_title"/>
- - <org.chromium.components.browser_ui.settings.ChromeBasePreference
- - android:key="google_services"
- - android:order="4"
- - android:layout="@layout/account_management_account_row"
- - android:title="@string/prefs_google_services"
- - android:icon="@drawable/ic_google_services_48dp"
- - android:fragment="org.chromium.chrome.browser.sync.settings.GoogleServicesSettings"/>
- + android:title="@string/prefs_section_account_and_google_services"
- + app:isPreferenceVisible="false" />
-
- <PreferenceCategory
- android:key="basics_section"
- diff --git a/chrome/android/java/res/xml/manage_sync_preferences.xml b/chrome/android/java/res/xml/manage_sync_preferences.xml
- --- a/chrome/android/java/res/xml/manage_sync_preferences.xml
- +++ b/chrome/android/java/res/xml/manage_sync_preferences.xml
- @@ -85,16 +85,4 @@
- android:key="sync_review_data"
- android:title="@string/sync_review_data"/>
-
- - <!-- This category is only shown for advanced sync consent flow. -->
- - <PreferenceCategory
- - android:key="search_and_browse_category"
- - android:title="@string/search_and_browse_category"
- - app:isPreferenceVisible="false">
- -
- - <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- - android:key="url_keyed_anonymized_data"
- - android:title="@string/url_keyed_anonymized_data_title"
- - android:summary="@string/url_keyed_anonymized_data_summary"/>
- - </PreferenceCategory>
- -
- </PreferenceScreen>
- diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
- --- a/chrome/android/java/res/xml/privacy_preferences.xml
- +++ b/chrome/android/java/res/xml/privacy_preferences.xml
- @@ -85,8 +85,4 @@
- android:title="@string/cablev2_paask_title"
- android:summary="@string/cablev2_paask_body"
- android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment"/>
- - <org.chromium.components.browser_ui.settings.TextMessagePreference
- - android:key="sync_and_services_link"
- - android:summary="@string/privacy_sync_and_services_link_legacy"
- - app:allowDividerBelow="false"/>
- </PreferenceScreen>
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java
- @@ -34,9 +34,7 @@ import org.chromium.chrome.browser.password_manager.GooglePasswordManagerUIProvi
- import org.chromium.chrome.browser.policy.PolicyAuditor;
- import org.chromium.chrome.browser.rlz.RevenueStats;
- import org.chromium.chrome.browser.survey.SurveyController;
- -import org.chromium.chrome.browser.sync.TrustedVaultClient;
- import org.chromium.chrome.browser.tab.Tab;
- -import org.chromium.chrome.browser.ui.signin.GoogleActivityController;
- import org.chromium.chrome.browser.usage_stats.DigitalWellbeingClient;
- import org.chromium.chrome.browser.webapps.GooglePlayWebApkInstallDelegate;
- import org.chromium.chrome.browser.xsurface.ProcessScope;
- @@ -45,8 +43,6 @@ import org.chromium.chrome.modules.image_editor.ImageEditorModuleProvider;
- import org.chromium.components.external_intents.AuthenticatorNavigationInterceptor;
- import org.chromium.components.policy.AppRestrictionsProvider;
- import org.chromium.components.policy.CombinedPolicyProvider;
- -import org.chromium.components.signin.AccountManagerDelegate;
- -import org.chromium.components.signin.SystemAccountManagerDelegate;
- import org.chromium.components.webapps.AppDetailsDelegate;
-
- import java.util.Collections;
- @@ -77,14 +73,6 @@ public abstract class AppHooks {
- return sInstance;
- }
-
- - /**
- - * Creates a new {@link AccountManagerDelegate}.
- - * @return the created {@link AccountManagerDelegate}.
- - */
- - public AccountManagerDelegate createAccountManagerDelegate() {
- - return new SystemAccountManagerDelegate();
- - }
- -
- /**
- * @return An instance of AppDetailsDelegate that can be queried about app information for the
- * App Banner feature. Will be null if one is unavailable.
- @@ -140,13 +128,6 @@ public abstract class AppHooks {
- return new FeedbackReporter() {};
- }
-
- - /**
- - * @return An instance of GoogleActivityController.
- - */
- - public GoogleActivityController createGoogleActivityController() {
- - return new GoogleActivityController();
- - }
- -
- /**
- * @return An instance of {@link GSAHelper} that handles the start point of chrome's integration
- * with GSA.
- @@ -279,13 +260,6 @@ public abstract class AppHooks {
- return ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED;
- }
-
- - /**
- - * Returns a new {@link TrustedVaultClient.Backend} instance.
- - */
- - public TrustedVaultClient.Backend createSyncTrustedVaultClientBackend() {
- - return new TrustedVaultClient.EmptyBackend();
- - }
- -
- /**
- * This is deprecated, and should not be called. Use FeedHooks instead.
- */
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java
- @@ -27,7 +27,6 @@ import org.chromium.chrome.browser.init.AsyncInitTaskRunner;
- import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
- import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.components.signin.AccountManagerFacadeProvider;
- import org.chromium.components.signin.AccountUtils;
- import org.chromium.components.signin.base.CoreAccountInfo;
- @@ -179,7 +178,6 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
- ParcelFileDescriptor newState) throws IOException {
- final ArrayList<String> backupNames = new ArrayList<>();
- final ArrayList<byte[]> backupValues = new ArrayList<>();
- - final AtomicReference<CoreAccountInfo> syncAccount = new AtomicReference<>();
-
- // The native preferences can only be read on the UI thread.
- Boolean nativePrefsRead = PostTask.runSynchronously(UiThreadTaskTraits.DEFAULT, () -> {
- @@ -188,10 +186,6 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
- // immediately, so by the time it does Chrome may not be running.
- if (!initializeBrowser()) return false;
-
- - syncAccount.set(IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .getPrimaryAccountInfo(ConsentLevel.SYNC));
- -
- String[] nativeBackupNames = ChromeBackupAgentImplJni.get().getBoolBackupNames(this);
- boolean[] nativeBackupValues = ChromeBackupAgentImplJni.get().getBoolBackupValues(this);
- assert nativeBackupNames.length == nativeBackupValues.length;
- @@ -245,8 +239,7 @@ public class ChromeBackupAgentImpl extends ChromeBackupAgent.Impl {
-
- // Finally add the user id.
- backupNames.add(ANDROID_DEFAULT_PREFIX + SIGNED_IN_ACCOUNT_KEY);
- - backupValues.add(ApiCompatibilityUtils.getBytesUtf8(
- - syncAccount.get() == null ? "" : syncAccount.get().getEmail()));
- + backupValues.add(ApiCompatibilityUtils.getBytesUtf8(""));
-
- BackupState newBackupState = new BackupState(backupNames, backupValues);
-
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java
- @@ -16,9 +16,6 @@ import org.chromium.base.annotations.JNINamespace;
- import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
- -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
-
- /**
- * Class for watching for changes to the Android preferences that are backed up using Android
- @@ -57,15 +54,6 @@ public class ChromeBackupWatcher {
- }
- }
- });
- - // Update the backup if the sign-in status changes.
- - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- - identityManager.addObserver(new IdentityManager.Observer() {
- - @Override
- - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
- - onBackupPrefsChanged();
- - }
- - });
- }
-
- @CalledByNative
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
- @@ -85,7 +85,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
- import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
- import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
- import org.chromium.chrome.browser.feed.FeedSurfaceTracker;
- -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
- import org.chromium.chrome.browser.flags.ActivityType;
- import org.chromium.chrome.browser.flags.CachedFeatureFlags;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- @@ -100,7 +99,6 @@ import org.chromium.chrome.browser.incognito.IncognitoStartup;
- import org.chromium.chrome.browser.incognito.IncognitoTabLauncher;
- import org.chromium.chrome.browser.incognito.IncognitoTabSnapshotController;
- import org.chromium.chrome.browser.incognito.IncognitoUtils;
- -import org.chromium.chrome.browser.infobar.SyncErrorInfoBar;
- import org.chromium.chrome.browser.layouts.LayoutStateProvider;
- import org.chromium.chrome.browser.layouts.LayoutType;
- import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
- @@ -135,9 +133,6 @@ import org.chromium.chrome.browser.search_engines.SearchEngineChoiceNotification
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.chrome.browser.share.send_tab_to_self.SendTabToSelfAndroidBridge;
- import org.chromium.chrome.browser.suggestions.SuggestionsMetrics;
- -import org.chromium.chrome.browser.survey.ChromeSurveyController;
- -import org.chromium.chrome.browser.sync.ui.SyncErrorMessage;
- -import org.chromium.chrome.browser.sync.ui.SyncErrorPromptUtils;
- import org.chromium.chrome.browser.tab.RedirectHandlerTabHelper;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabAssociatedApp;
- @@ -671,9 +666,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
- }
-
- private void refreshSignIn() {
- - try (TraceEvent e = TraceEvent.scoped("ChromeTabbedActivity.refreshSignIn")) {
- - FirstRunSignInProcessor.start(this);
- - }
- }
-
- private void setupCompositorContentPreNativeForPhone() {
- @@ -1859,14 +1851,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
- if (!navigation.hasCommitted() || !navigation.isInPrimaryMainFrame()) {
- return;
- }
- - try (TraceEvent e = TraceEvent.scoped("CheckSyncErrorOnDidFinishNavigation")) {
- - if (SyncErrorPromptUtils.isMessageUiEnabled()) {
- - SyncErrorMessage.maybeShowMessageUi(
- - getWindowAndroid(), ChromeTabbedActivity.this);
- - } else {
- - SyncErrorInfoBar.maybeLaunchSyncErrorInfoBar(tab.getWebContents());
- - }
- - }
- try (TraceEvent te = TraceEvent.scoped("updateActiveWebContents")) {
- SendTabToSelfAndroidBridge.updateActiveWebContents(tab.getWebContents());
- }
- @@ -1959,9 +1943,6 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
-
- LauncherShortcutActivity.updateIncognitoShortcut(ChromeTabbedActivity.this);
-
- - ChromeSurveyController.initialize(mTabModelSelector, getLifecycleDispatcher(),
- - ChromeTabbedActivity.this, MessageDispatcherProvider.from(getWindowAndroid()));
- -
- if (mStartSurfaceSupplier.get() != null) {
- // The tab switcher is not the layout shown on startup, so wait until it is shown
- // before notifying the start surface that is was.
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
- @@ -105,7 +105,6 @@ import org.chromium.chrome.browser.download.DownloadUtils;
- import org.chromium.chrome.browser.download.items.OfflineContentAggregatorNotificationBridgeUiFactory;
- import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
- import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
- -import org.chromium.chrome.browser.firstrun.ForcedSigninProcessor;
- import org.chromium.chrome.browser.flags.ActivityType;
- import org.chromium.chrome.browser.flags.CachedFeatureFlags;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- @@ -154,7 +153,6 @@ import org.chromium.chrome.browser.share.ShareDelegateImpl;
- import org.chromium.chrome.browser.share.ShareDelegateSupplier;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
- import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.chrome.browser.tab.AccessibilityVisibilityHandler;
- import org.chromium.chrome.browser.tab.RequestDesktopUtils;
- import org.chromium.chrome.browser.tab.Tab;
- @@ -216,8 +214,6 @@ import org.chromium.components.page_info.PageInfoController.OpenedFromSource;
- import org.chromium.components.policy.CombinedPolicyProvider;
- import org.chromium.components.policy.CombinedPolicyProvider.PolicyChangeListener;
- import org.chromium.components.profile_metrics.BrowserProfileType;
- -import org.chromium.components.sync.ModelType;
- -import org.chromium.components.sync.PassphraseType;
- import org.chromium.components.user_prefs.UserPrefs;
- import org.chromium.components.webapk.lib.client.WebApkValidator;
- import org.chromium.components.webapps.AddToHomescreenCoordinator;
- @@ -312,9 +308,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- private boolean mRemoveWindowBackgroundDone;
- protected AccessibilityVisibilityHandler mAccessibilityVisibilityHandler;
-
- - // Observes when sync becomes ready to create the mContextReporter.
- - private SyncService.SyncStateChangedListener mSyncStateChangedListener;
- -
- // The PictureInPictureController is initialized lazily https://crbug.com/729738.
- private PictureInPictureController mPictureInPictureController;
-
- @@ -1041,61 +1034,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- return StatusBarColorController.UNDEFINED_STATUS_BAR_COLOR;
- }
-
- - private void createContextReporterIfNeeded() {
- - if (!mStarted) return; // Sync state reporting should work only in started state.
- - if (mContextReporter != null || getActivityTab() == null) return;
- -
- - final SyncService syncService = SyncService.get();
- -
- - if (syncService != null && syncService.isSyncingUrlsWithKeystorePassphrase()) {
- - ContextReporter.SelectionReporter controller =
- - getContextualSearchManagerSupplier().hasValue() ? new ContextReporter.SelectionReporter() {
- - @Override
- - public void enable(Callback<GSAContextDisplaySelection> callback) {
- - getContextualSearchManagerSupplier().get().enableContextReporting(
- - callback);
- - }
- -
- - @Override
- - public void disable() {
- - getContextualSearchManagerSupplier().get().disableContextReporting();
- - }
- - } : null;
- - mContextReporter = AppHooks.get().createGsaHelper().getContextReporter(
- - getActivityTabProvider(), mTabModelSelectorSupplier, controller);
- -
- - if (mSyncStateChangedListener != null) {
- - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
- - mSyncStateChangedListener = null;
- - }
- -
- - return;
- - } else {
- - reportSyncStatus(syncService);
- - }
- -
- - if (mSyncStateChangedListener == null && syncService != null) {
- - mSyncStateChangedListener = () -> createContextReporterIfNeeded();
- - syncService.addSyncStateChangedListener(mSyncStateChangedListener);
- - }
- - }
- -
- - /**
- - * Records an appropriate status via UMA given the current sync status.
- - */
- - private static void reportSyncStatus(@Nullable SyncService syncService) {
- - if (syncService == null || !syncService.isEngineInitialized()) {
- - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_INITIALIZED);
- - } else if (!syncService.getActiveDataTypes().contains(ModelType.TYPED_URLS)) {
- - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_SYNCING_URLS);
- - } else if (syncService.getPassphraseType() != PassphraseType.KEYSTORE_PASSPHRASE
- - && syncService.getPassphraseType() != PassphraseType.TRUSTED_VAULT_PASSPHRASE) {
- - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_NOT_KEYSTORE_PASSPHRASE);
- - } else {
- - ContextReporter.reportStatus(ContextReporter.STATUS_SYNC_OTHER);
- - }
- - }
- -
- @Override
- public void onResumeWithNative() {
- // TODO(b/182286787): Clean-up once fixed session resume order is verified.
- @@ -1229,14 +1167,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- if (GSAState.getInstance(this).isGsaAvailable() && !SysUtils.isLowEndDevice()) {
- if (mGSAAccountChangeListener != null) mGSAAccountChangeListener.disconnect();
- }
- - if (mSyncStateChangedListener != null) {
- - SyncService syncService = SyncService.get();
- - if (syncService != null) {
- - syncService.removeSyncStateChangedListener(mSyncStateChangedListener);
- - }
- - mSyncStateChangedListener = null;
- - }
- - if (mContextReporter != null) mContextReporter.disable();
-
- super.onStopWithNative();
- }
- @@ -1327,11 +1257,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- .recordUserFontPrefOnStartup();
- });
-
- - DeferredStartupHandler.getInstance().addDeferredTask(() -> {
- - if (isActivityFinishingOrDestroyed()) return;
- - ForcedSigninProcessor.checkCanSignIn(ChromeActivity.this);
- - });
- -
- // GSA connection is not needed on low-end devices because Icing is disabled.
- if (!SysUtils.isLowEndDevice()) {
- if (isActivityFinishingOrDestroyed()) return;
- @@ -1346,7 +1271,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
- GSAAccountChangeListener.create(AppHooks.get().createGsaHelper());
- }
- mGSAAccountChangeListener.connect();
- - createContextReporterIfNeeded();
- });
- }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
- @@ -18,8 +18,6 @@ import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- -import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
- -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
- import org.chromium.components.autofill_assistant.AssistantFeatures;
- import org.chromium.components.autofill_assistant.AutofillAssistantPreferencesUtil;
- import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
- @@ -53,7 +51,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
- private ChromeSwitchPreference mAutofillAssistantPreference;
- private ChromeSwitchPreference mProactiveHelpPreference;
- private ChromeSwitchPreference mAssistantVoiceSearchEnabledPref;
- - private Preference mGoogleServicesSettingsLink;
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- @@ -89,15 +86,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
- mProactiveHelpPreference.setVisible(false);
- }
-
- - mGoogleServicesSettingsLink = findPreference(PREF_GOOGLE_SERVICES_SETTINGS_LINK);
- - NoUnderlineClickableSpan linkSpan = new NoUnderlineClickableSpan(getContext(), view -> {
- - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- - settingsLauncher.launchSettingsActivity(requireContext(), GoogleServicesSettings.class);
- - });
- - mGoogleServicesSettingsLink.setSummary(
- - SpanApplier.applySpans(getString(R.string.prefs_proactive_help_sync_link),
- - new SpanApplier.SpanInfo("<link>", "</link>", linkSpan)));
- -
- PreferenceCategory assistantVoiceSearchCategory =
- findPreference(PREF_ASSISTANT_VOICE_SEARCH_CATEGORY);
- mAssistantVoiceSearchEnabledPref =
- @@ -145,9 +133,7 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
-
- boolean assistant_switch_on_or_missing =
- !mAutofillAssistantPreference.isVisible() || autofill_assistant_enabled;
- - boolean url_keyed_anonymized_data_collection_enabled =
- - UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
- - Profile.getLastUsedRegularProfile());
- + boolean url_keyed_anonymized_data_collection_enabled = false;
-
- boolean proactive_help_on =
- AutofillAssistantPreferencesUtil.getProactiveHelpPreference(true);
- @@ -163,7 +149,6 @@ public class AutofillAssistantPreferenceFragment extends PreferenceFragmentCompa
- }
- mProactiveHelpPreference.setEnabled(proactive_toggle_enabled);
- mProactiveHelpPreference.setChecked(proactive_toggle_enabled && proactive_help_on);
- - mGoogleServicesSettingsLink.setVisible(show_disclaimer);
-
- mAssistantVoiceSearchEnabledPref.setChecked(mSharedPreferencesManager.readBoolean(
- ChromePreferenceKeys.ASSISTANT_VOICE_SEARCH_ENABLED, /* default= */ false));
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java
- @@ -32,10 +32,7 @@ import org.chromium.chrome.browser.power_bookmarks.PowerBookmarkType;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
- import org.chromium.chrome.browser.subscriptions.SubscriptionsManager;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
- -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
- import org.chromium.components.bookmarks.BookmarkId;
- import org.chromium.components.bookmarks.BookmarkType;
- import org.chromium.components.browser_ui.util.GlobalDiscardableReferencePool;
- @@ -55,7 +52,7 @@ import java.util.List;
- * BaseAdapter for {@link RecyclerView}. It manages bookmarks to list there.
- */
- class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- - implements BookmarkUIObserver, SyncService.SyncStateChangedListener {
- + implements BookmarkUIObserver {
- private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
- private static final String EMPTY_QUERY = null;
-
- @@ -68,10 +65,8 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- @ViewType
- private int mPromoHeaderType = ViewType.INVALID;
- private BookmarkDelegate mDelegate;
- - private BookmarkPromoHeader mPromoHeaderManager;
- private String mSearchText;
- private BookmarkId mCurrentFolder;
- - private SyncService mSyncService;
- private CommerceSubscriptionsServiceFactory mCommerceSubscriptionsServiceFactory;
-
- // Keep track of the currently highlighted bookmark - used for "show in folder" action.
- @@ -127,8 +122,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
-
- BookmarkItemsAdapter(Context context, SnackbarManager snackbarManager) {
- super(context);
- - mSyncService = SyncService.get();
- - mSyncService.addSyncStateChangedListener(this);
-
- mImageFetcher =
- ImageFetcherFactory.createImageFetcher(ImageFetcherConfig.IN_MEMORY_WITH_DISK_CACHE,
- @@ -242,9 +235,9 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- case ViewType.PERSONALIZED_SIGNIN_PROMO:
- // fall through
- case ViewType.PERSONALIZED_SYNC_PROMO:
- - return mPromoHeaderManager.createPersonalizedSigninAndSyncPromoHolder(parent);
- + return null;
- case ViewType.SYNC_PROMO:
- - return mPromoHeaderManager.createSyncPromoHolder(parent);
- + return null;
- case ViewType.SECTION_HEADER:
- return createSectionHeaderViewHolder(parent, viewType);
- case ViewType.FOLDER:
- @@ -280,10 +273,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- public void onBindViewHolder(ViewHolder holder, int position) {
- if (holder.getItemViewType() == ViewType.PERSONALIZED_SIGNIN_PROMO
- || holder.getItemViewType() == ViewType.PERSONALIZED_SYNC_PROMO) {
- - PersonalizedSigninPromoView view =
- - (PersonalizedSigninPromoView) holder.itemView.findViewById(
- - R.id.signin_promo_view_container);
- - mPromoHeaderManager.setUpSyncPromoView(view);
- } else if (holder.getItemViewType() == ViewType.SECTION_HEADER) {
- bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
- } else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
- @@ -344,7 +333,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- case ViewType.PERSONALIZED_SIGNIN_PROMO:
- // fall through
- case ViewType.PERSONALIZED_SYNC_PROMO:
- - mPromoHeaderManager.detachPersonalizePromoView();
- break;
- default:
- // Other view holders don't have special recycling code.
- @@ -367,7 +355,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- updateHeader(true);
- };
-
- - mPromoHeaderManager = new BookmarkPromoHeader(mContext, promoHeaderChangeAction);
- populateTopLevelFoldersList();
-
- mElements = new ArrayList<>();
- @@ -382,8 +369,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- mDelegate.getModel().removeObserver(mBookmarkModelObserver);
- mDelegate.getSelectionDelegate().removeObserver(this);
- mDelegate = null;
- - mPromoHeaderManager.destroy();
- - mSyncService.removeSyncStateChangedListener(this);
- }
-
- @Override
- @@ -478,18 +463,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- setOrder(mElements);
- }
-
- - // SyncStateChangedListener implementation.
- - @Override
- - public void syncStateChanged() {
- - // If mDelegate is null, we will set the top level folders upon its initialization
- - // (see onBookmarkDelegateInitialized method above).
- - if (mDelegate == null) {
- - return;
- - }
- - mTopLevelFolders.clear();
- - populateTopLevelFoldersList();
- - }
- -
- /**
- * Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
- * promo header. This 0th index is null iff there is a promo header.
- @@ -510,22 +483,7 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
- } else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
- mPromoHeaderType = ViewType.INVALID;
- } else {
- - switch (mPromoHeaderManager.getPromoState()) {
- - case SyncPromoState.NO_PROMO:
- mPromoHeaderType = ViewType.INVALID;
- - break;
- - case SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE:
- - mPromoHeaderType = ViewType.PERSONALIZED_SIGNIN_PROMO;
- - break;
- - case SyncPromoState.PROMO_FOR_SIGNED_IN_STATE:
- - mPromoHeaderType = ViewType.PERSONALIZED_SYNC_PROMO;
- - break;
- - case SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE:
- - mPromoHeaderType = ViewType.SYNC_PROMO;
- - break;
- - default:
- - assert false : "Unexpected value for promo state!";
- - }
- }
-
- boolean willShowPromo = hasPromoHeader();
- @@ -648,7 +606,6 @@ class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkListEntry>
-
- @VisibleForTesting
- void simulateSignInForTests() {
- - syncStateChanged();
- onFolderStateSet(mCurrentFolder);
- }
-
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPromoHeader.java
- @@ -18,43 +18,18 @@ import org.chromium.chrome.R;
- import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
- -import org.chromium.chrome.browser.signin.SyncPromoView;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
- -import org.chromium.chrome.browser.signin.services.SigninManager;
- -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
- -import org.chromium.chrome.browser.sync.SyncService;
- -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
- -import org.chromium.components.signin.AccountManagerFacade;
- -import org.chromium.components.signin.AccountManagerFacadeProvider;
- -import org.chromium.components.signin.AccountsChangeObserver;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.metrics.SigninAccessPoint;
-
- /**
- * Class that manages all the logic and UI behind the signin promo header in the bookmark
- * content UI. The header is shown only on certain situations, (e.g., not signed in).
- */
- -class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignInStateObserver,
- - ProfileDataCache.Observer, AccountsChangeObserver {
- +class BookmarkPromoHeader {
- // TODO(kkimlabs): Figure out the optimal number based on UMA data.
- private static final int MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT = 10;
-
- - private static @Nullable @SyncPromoState Integer sPromoStateForTests;
- -
- private final Context mContext;
- - private final SigninManager mSignInManager;
- - private final AccountManagerFacade mAccountManagerFacade;
- private final Runnable mPromoHeaderChangeAction;
-
- - private @Nullable ProfileDataCache mProfileDataCache;
- - private final @Nullable SigninPromoController mSigninPromoController;
- - private @SyncPromoState int mPromoState = SyncPromoState.NO_PROMO;
- - private final @Nullable SyncService mSyncService;
- -
- /**
- * Initializes the class. Note that this will start listening to signin related events and
- * update itself if needed.
- @@ -62,200 +37,22 @@ class BookmarkPromoHeader implements SyncService.SyncStateChangedListener, SignI
- BookmarkPromoHeader(Context context, Runnable promoHeaderChangeAction) {
- mContext = context;
- mPromoHeaderChangeAction = promoHeaderChangeAction;
- -
- - mSyncService = SyncService.get();
- - if (mSyncService != null) mSyncService.addSyncStateChangedListener(this);
- -
- - mSignInManager = IdentityServicesProvider.get().getSigninManager(
- - Profile.getLastUsedRegularProfile());
- - mSignInManager.addSignInStateObserver(this);
- -
- - mAccountManagerFacade = AccountManagerFacadeProvider.getInstance();
- -
- - if (SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER)) {
- - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(mContext);
- - mProfileDataCache.addObserver(this);
- - mSigninPromoController = new SigninPromoController(
- - SigninAccessPoint.BOOKMARK_MANAGER, SyncConsentActivityLauncherImpl.get());
- - mAccountManagerFacade.addObserver(this);
- - } else {
- - mProfileDataCache = null;
- - mSigninPromoController = null;
- - }
- - updatePromoState();
- }
-
- /**
- * Clean ups the class. Must be called once done using this class.
- */
- void destroy() {
- - if (mSyncService != null) mSyncService.removeSyncStateChangedListener(this);
- -
- - if (mSigninPromoController != null) {
- - mAccountManagerFacade.removeObserver(this);
- - mProfileDataCache.removeObserver(this);
- - mSigninPromoController.onPromoDestroyed();
- - }
- -
- - mSignInManager.removeSignInStateObserver(this);
- - }
- -
- - /**
- - * @return The current state of the promo.
- - */
- - @SyncPromoState
- - int getPromoState() {
- - return mPromoState;
- - }
- -
- - /**
- - * @return Personalized signin promo header {@link ViewHolder} instance that can be used with
- - * {@link RecyclerView}.
- - */
- - ViewHolder createPersonalizedSigninAndSyncPromoHolder(ViewGroup parent) {
- - View view = LayoutInflater.from(mContext).inflate(
- - R.layout.personalized_signin_promo_view_bookmarks, parent, false);
- -
- - // ViewHolder is abstract and it cannot be instantiated directly.
- - return new ViewHolder(view) {};
- - }
- -
- - /**
- - * @return Sync promo header {@link ViewHolder} instance that can be used with
- - * {@link RecyclerView}.
- - */
- - ViewHolder createSyncPromoHolder(ViewGroup parent) {
- - SyncPromoView view = SyncPromoView.create(parent, SigninAccessPoint.BOOKMARK_MANAGER);
- -
- - // ViewHolder is abstract and it cannot be instantiated directly.
- - return new ViewHolder(view) {};
- - }
- -
- - /**
- - * Sets up the sync promo view.
- - */
- - void setUpSyncPromoView(PersonalizedSigninPromoView view) {
- - mSigninPromoController.setUpSyncPromoView(
- - mProfileDataCache, view, this::setPersonalizedSigninPromoDeclined);
- - }
- -
- - /**
- - * Detaches the previously configured {@link PersonalizedSigninPromoView}.
- - */
- - void detachPersonalizePromoView() {
- - if (mSigninPromoController != null) mSigninPromoController.detach();
- - }
- -
- - /**
- - * Saves that the personalized signin promo was declined and updates the UI.
- - */
- - private void setPersonalizedSigninPromoDeclined() {
- - mPromoState = calculatePromoState();
- - triggerPromoUpdate();
- }
-
- /**
- * @return Whether the personalized signin promo should be shown to user.
- */
- private boolean shouldShowBookmarkSigninPromo() {
- - return mSignInManager.isSyncOptInAllowed()
- - && SigninPromoController.canShowSyncPromo(SigninAccessPoint.BOOKMARK_MANAGER);
- - }
- -
- - private @SyncPromoState int calculatePromoState() {
- - if (sPromoStateForTests != null) {
- - return sPromoStateForTests;
- - }
- -
- - if (mSyncService == null) {
- - // |mSyncService| will remain null until the next browser startup, so no sense in
- - // offering any promo.
- - return SyncPromoState.NO_PROMO;
- - }
- -
- - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
- - if (!shouldShowBookmarkSigninPromo()) {
- - return SyncPromoState.NO_PROMO;
- - }
- -
- - return mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)
- - ? SyncPromoState.PROMO_FOR_SIGNED_IN_STATE
- - : SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE;
- - }
- -
- - boolean impressionLimitNotReached =
- - SharedPreferencesManager.getInstance().readInt(
- - ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT)
- - < MAX_SIGNIN_AND_SYNC_PROMO_SHOW_COUNT;
- - if (!mSyncService.isSyncRequested() && impressionLimitNotReached) {
- - return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
- - }
- - return SyncPromoState.NO_PROMO;
- - }
- -
- - private void updatePromoState() {
- - final @SyncPromoState int newState = calculatePromoState();
- - if (newState == mPromoState) return;
- -
- - // PROMO_SYNC state and it's impression counts is not tracked by SigninPromoController.
- - final boolean hasSyncPromoStateChangedtoShown =
- - (mPromoState == SyncPromoState.NO_PROMO
- - || mPromoState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE)
- - && (newState == SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE
- - || newState == SyncPromoState.PROMO_FOR_SIGNED_IN_STATE);
- - if (mSigninPromoController != null && hasSyncPromoStateChangedtoShown) {
- - mSigninPromoController.increasePromoShowCount();
- - }
- - if (newState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE) {
- - SharedPreferencesManager.getInstance().incrementInt(
- - ChromePreferenceKeys.SIGNIN_AND_SYNC_PROMO_SHOW_COUNT);
- - }
- - mPromoState = newState;
- - }
- -
- - // SyncService.SyncStateChangedListener implementation.
- - @Override
- - public void syncStateChanged() {
- - updatePromoState();
- - triggerPromoUpdate();
- - }
- -
- - // SignInStateObserver implementation.
- - @Override
- - public void onSignedIn() {
- - updatePromoState();
- - triggerPromoUpdate();
- - }
- -
- - @Override
- - public void onSignedOut() {
- - updatePromoState();
- - triggerPromoUpdate();
- - }
- -
- - // ProfileDataCache.Observer implementation.
- - @Override
- - public void onProfileDataUpdated(String accountEmail) {
- - triggerPromoUpdate();
- - }
- -
- - // AccountsChangeObserver implementation.
- - @Override
- - public void onAccountsChanged() {
- - triggerPromoUpdate();
- + return false;
- }
-
- private void triggerPromoUpdate() {
- - detachPersonalizePromoView();
- mPromoHeaderChangeAction.run();
- }
- -
- - /**
- - * Forces the promo state to a particular value for testing purposes.
- - * @param promoState The promo state to which the header will be set to.
- - */
- - @VisibleForTesting
- - static void forcePromoStateForTests(@Nullable @SyncPromoState Integer promoState) {
- - sPromoStateForTests = promoState;
- - }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragmentBasic.java
- @@ -23,16 +23,12 @@ import org.chromium.base.metrics.RecordUserAction;
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.chrome.browser.tab.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
- import org.chromium.components.browser_ui.settings.ClickableSpansTextMessagePreference;
- import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.components.search_engines.TemplateUrl;
- import org.chromium.components.search_engines.TemplateUrlService;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
- import org.chromium.components.sync.ModelType;
- import org.chromium.ui.text.NoUnderlineClickableSpan;
- import org.chromium.ui.text.SpanApplier;
- @@ -89,27 +85,11 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
- new TabDelegate(false /* incognito */)
- .launchUrl(UrlConstants.MY_ACTIVITY_URL_IN_CBD, TabLaunchType.FROM_CHROME_UI);
- });
- -
- - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- - if (identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN)) {
- - // Update the Clear Browsing History text based on the sign-in/sync state and whether
- - // the link to MyActivity is displayed inline or at the bottom of the page.
- - // Note: when sync is disabled, the default string is used.
- - if (isHistorySyncEnabled()) {
- - // The text is different only for users with history sync.
- - historyCheckbox.setSummary(R.string.clear_browsing_history_summary_synced_no_link);
- - }
- - cookiesCheckbox.setSummary(
- - R.string.clear_cookies_and_site_data_summary_basic_signed_in);
- - }
- }
-
- @Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- super.onCreatePreferences(savedInstanceState, rootKey);
- - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- ClickableSpansTextMessagePreference googleDataTextPref =
- (ClickableSpansTextMessagePreference) findPreference(
- ClearBrowsingDataFragment.PREF_GOOGLE_DATA_TEXT);
- @@ -120,20 +100,11 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
- boolean isDefaultSearchEngineGoogle = templateUrlService.isDefaultSearchEngineGoogle();
-
- // Google-related links to delete search history and other browsing activity.
- - if (defaultSearchEngine == null
- - || !identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN)) {
- // One of two cases:
- // 1. The default search engine is disabled.
- // 2. The user is not signed into Chrome.
- // In all those cases, delete the link to clear Google data using MyActivity.
- deleteGoogleDataTextIfExists();
- - } else if (isDefaultSearchEngineGoogle) {
- - // Signed-in and the DSE is Google. Build the text with two links.
- - googleDataTextPref.setSummary(buildGoogleSearchHistoryText());
- - } else {
- - // Signed-in and non-Google DSE. Build the text with the MyActivity link only.
- - googleDataTextPref.setSummary(buildGoogleMyActivityText());
- - }
-
- // Text for search history if DSE is not Google.
- if (defaultSearchEngine == null || isDefaultSearchEngineGoogle) {
- @@ -224,9 +195,7 @@ public class ClearBrowsingDataFragmentBasic extends ClearBrowsingDataFragment {
- }
-
- private boolean isHistorySyncEnabled() {
- - SyncService syncService = SyncService.get();
- - return syncService != null && syncService.isSyncRequested()
- - && syncService.getActiveDataTypes().contains(ModelType.HISTORY_DELETE_DIRECTIVES);
- + return false;
- }
-
- @Override
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ChromePickerAdapter.java
- @@ -15,16 +15,8 @@ import androidx.recyclerview.widget.RecyclerView;
-
- import org.chromium.chrome.R;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
- import org.chromium.components.browser_ui.contacts_picker.ContactDetails;
- import org.chromium.components.browser_ui.contacts_picker.PickerAdapter;
- -import org.chromium.components.signin.AccountManagerFacadeProvider;
- -import org.chromium.components.signin.AccountUtils;
- -import org.chromium.components.signin.base.CoreAccountInfo;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
-
- import java.util.ArrayList;
- import java.util.Collections;
- @@ -35,10 +27,7 @@ import java.util.Collections;
- * Owner email is looked up in the {@link ProfileDataCache}, or, failing that, via the {@link
- * AccountManagerFacade}.
- */
- -public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCache.Observer {
- - // The profile data cache to consult when figuring out the signed in user.
- - private ProfileDataCache mProfileDataCache;
- -
- +public class ChromePickerAdapter extends PickerAdapter {
- // Whether an observer for ProfileDataCache has been registered.
- private boolean mObserving;
-
- @@ -46,8 +35,6 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
- private boolean mWaitingOnOwnerInfo;
-
- public ChromePickerAdapter(Context context) {
- - mProfileDataCache =
- - ProfileDataCache.createWithoutBadge(context, R.dimen.contact_picker_icon_size);
- }
-
- // Adapter:
- @@ -64,38 +51,15 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
- removeProfileDataObserver();
- }
-
- - // ProfileDataCache.Observer:
- -
- - @Override
- - public void onProfileDataUpdated(String accountEmail) {
- - if (!mWaitingOnOwnerInfo || !TextUtils.equals(accountEmail, getOwnerEmail())) {
- - return;
- - }
- -
- - // Now that we've received an update for the right accountId, we can stop listening and
- - // update our records.
- - mWaitingOnOwnerInfo = false;
- - removeProfileDataObserver();
- - // TODO(finnur): crbug.com/1021477 - Maintain an member instance of this.
- - DisplayableProfileData profileData =
- - mProfileDataCache.getProfileDataOrDefault(getOwnerEmail());
- - ContactDetails contact = getAllContacts().get(0);
- - Drawable icon = profileData.getImage();
- - contact.setSelfIcon(icon);
- - update();
- - }
- -
- private void addProfileDataObserver() {
- if (!mObserving) {
- mObserving = true;
- - mProfileDataCache.addObserver(this);
- }
- }
-
- private void removeProfileDataObserver() {
- if (mObserving) {
- mObserving = false;
- - mProfileDataCache.removeObserver(this);
- }
- }
-
- @@ -107,13 +71,7 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
- */
- @Override
- protected String findOwnerEmail() {
- - CoreAccountInfo coreAccountInfo = getCoreAccountInfo();
- - if (coreAccountInfo != null) {
- - return coreAccountInfo.getEmail();
- - }
- - final @Nullable Account defaultAccount = AccountUtils.getDefaultAccountIfFulfilled(
- - AccountManagerFacadeProvider.getInstance().getAccounts());
- - return defaultAccount != null ? defaultAccount.name : null;
- + return null;
- }
-
- @Override
- @@ -134,25 +92,11 @@ public class ChromePickerAdapter extends PickerAdapter implements ProfileDataCac
- */
- @SuppressLint("HardwareIds")
- private ContactDetails constructOwnerInfo(String ownerEmail) {
- - DisplayableProfileData profileData = mProfileDataCache.getProfileDataOrDefault(ownerEmail);
- - String name = profileData.getFullNameOrEmail();
- - if (TextUtils.isEmpty(name) || TextUtils.equals(name, ownerEmail)) {
- - name = CoreAccountInfo.getEmailFrom(getCoreAccountInfo());
- - }
- + String name = "nobody@example.com";
-
- ContactDetails contact = new ContactDetails(ContactDetails.SELF_CONTACT_ID, name,
- Collections.singletonList(ownerEmail), /*phoneNumbers=*/null, /*addresses=*/null);
- - Drawable icon = profileData.getImage();
- contact.setIsSelf(true);
- - contact.setSelfIcon(icon);
- return contact;
- }
- -
- - private CoreAccountInfo getCoreAccountInfo() {
- - // Since this is read-only operation to obtain email address, always using regular profile
- - // for both regular and off-the-record profile is safe.
- - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- - return identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC);
- - }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
- @@ -37,7 +37,6 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvid
- import org.chromium.chrome.browser.customtabs.dependency_injection.BaseCustomTabActivityComponent;
- import org.chromium.chrome.browser.customtabs.features.CustomTabNavigationBarController;
- import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
- -import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
- import org.chromium.chrome.browser.flags.AllCachedFieldTrialParameters;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.fonts.FontPreloader;
- @@ -150,8 +149,6 @@ public class CustomTabActivity extends BaseCustomTabActivity {
-
- @Override
- public void finishNativeInitialization() {
- - if (!mIntentDataProvider.isInfoPage()) FirstRunSignInProcessor.start(this);
- -
- mConnection.showSignInToastIfNecessary(mSession, getIntent());
-
- new CustomTabTrustedCdnPublisherUrlVisibility(
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
- @@ -265,7 +265,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
- findViewById(android.R.id.content), () -> mPages.size() > 0);
- }
-
- - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) {
- + mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
- @Override
- public void onFlowIsKnown(Bundle freProperties) {
- assert freProperties != null;
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
- @@ -23,7 +23,6 @@ import org.chromium.chrome.browser.init.AsyncInitializationActivity;
- import org.chromium.chrome.browser.metrics.UmaUtils;
- import org.chromium.chrome.browser.policy.PolicyServiceFactory;
- import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
- -import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
- import org.chromium.components.policy.PolicyService;
- import org.chromium.components.signin.AccountManagerFacade;
- import org.chromium.components.signin.AccountManagerFacadeProvider;
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
- @@ -131,13 +131,11 @@ public abstract class FirstRunFlowSequencer {
- public abstract void onFlowIsKnown(Bundle freProperties);
-
- public FirstRunFlowSequencer(
- - Activity activity, OneshotSupplier<Boolean> childAccountStatusSupplier) {
- + Activity activity) {
- mActivity = activity;
-
- mDelegate = sDelegateForTesting != null ? sDelegateForTesting
- : new FirstRunFlowSequencerDelegate();
- -
- - childAccountStatusSupplier.onAvailable(this::setChildAccountStatus);
- }
-
- /**
- @@ -165,12 +163,6 @@ public abstract class FirstRunFlowSequencer {
- return mDelegate.shouldShowSyncConsentPage(mActivity, mGoogleAccounts, mIsChild);
- }
-
- - private void setChildAccountStatus(boolean isChild) {
- - assert mIsChild == null;
- - mIsChild = isChild;
- - maybeProcessFreEnvironmentPreNative();
- - }
- -
- private void setAccountList(List<Account> accounts) {
- assert mGoogleAccounts == null && accounts != null;
- mGoogleAccounts = accounts;
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunPageDelegate.java
- @@ -84,9 +84,4 @@ public interface FirstRunPageDelegate {
- * See {@link PolicyLoadListener} for details.
- */
- OneshotSupplier<Boolean> getPolicyLoadListener();
- -
- - /**
- - * Returns the supplier that supplies child account status.
- - */
- - OneshotSupplier<Boolean> getChildAccountStatusSupplier();
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/LightweightFirstRunActivity.java
- @@ -88,7 +88,7 @@ public class LightweightFirstRunActivity
-
- setFinishOnTouchOutside(true);
-
- - mFirstRunFlowSequencer = new FirstRunFlowSequencer(this, getChildAccountStatusSupplier()) {
- + mFirstRunFlowSequencer = new FirstRunFlowSequencer(this) {
- @Override
- public void onFlowIsKnown(Bundle freProperties) {
- if (freProperties == null) {
- @@ -96,9 +96,7 @@ public class LightweightFirstRunActivity
- return;
- }
-
- - boolean isChild = freProperties.getBoolean(
- - SyncConsentFirstRunFragment.IS_CHILD_ACCOUNT, false);
- - initializeViews(isChild);
- + initializeViews(false);
- }
- };
- mFirstRunFlowSequencer.start();
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaFirstRunFragmentWithEnterpriseSupport.java
- @@ -125,12 +125,6 @@ public class TosAndUmaFirstRunFragmentWithEnterpriseSupport
- }
- }
-
- - @Override
- - protected boolean canShowUmaCheckBox() {
- - return super.canShowUmaCheckBox() && mSkipTosDialogPolicyListener.get() != null
- - && !mSkipTosDialogPolicyListener.get();
- - }
- -
- @Override
- public void onShowLoadingUIComplete() {
- mLoadingSpinnerContainer.setVisibility(View.VISIBLE);
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryContentManager.java
- @@ -33,8 +33,6 @@ import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
- import org.chromium.chrome.browser.preferences.PrefChangeRegistrar.PrefObserver;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
- @@ -51,7 +49,7 @@ import org.chromium.url.GURL;
- /**
- * Displays and manages the content view / list UI for browsing history.
- */
- -public class HistoryContentManager implements SignInStateObserver, PrefObserver {
- +public class HistoryContentManager implements PrefObserver {
- /**
- * Interface for a class that wants to receive updates from this Manager.
- */
- @@ -207,11 +205,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
- mHistoryAdapter.generateHeaderItems();
- mHistoryAdapter.generateFooterItems();
-
- - // Listen to changes in sign in state.
- - IdentityServicesProvider.get()
- - .getSigninManager(Profile.getLastUsedRegularProfile())
- - .addSignInStateObserver(this);
- -
- // Create PrefChangeRegistrar to receive notifications on preference changes.
- mPrefChangeRegistrar = new PrefChangeRegistrar();
- mPrefChangeRegistrar.addObserver(Pref.ALLOW_DELETING_BROWSER_HISTORY, this);
- @@ -245,9 +238,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
- mHistoryAdapter.onDestroyed();
- mLargeIconBridge.destroy();
- mLargeIconBridge = null;
- - IdentityServicesProvider.get()
- - .getSigninManager(Profile.getLastUsedRegularProfile())
- - .removeSignInStateObserver(this);
- mPrefChangeRegistrar.destroy();
- }
-
- @@ -453,18 +443,6 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
- mHistoryAdapter.removeHeader();
- }
-
- - @Override
- - public void onSignedIn() {
- - mObserver.onUserAccountStateChanged();
- - mHistoryAdapter.onSignInStateChange();
- - }
- -
- - @Override
- - public void onSignedOut() {
- - mObserver.onUserAccountStateChanged();
- - mHistoryAdapter.onSignInStateChange();
- - }
- -
- @Override
- public void onPreferenceChange() {
- mObserver.onUserAccountStateChanged();
- @@ -511,4 +489,4 @@ public class HistoryContentManager implements SignInStateObserver, PrefObserver
- public static void setScrollToLoadDisabledForTesting(boolean isScrollToLoadDisabled) {
- sIsScrollToLoadDisabledForTests = isScrollToLoadDisabled;
- }
- -}
- \ No newline at end of file
- +}
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
- @@ -22,8 +22,6 @@ import org.chromium.chrome.browser.ntp.NewTabPage;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.settings.MainSettings;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.toolbar.ButtonData;
- import org.chromium.chrome.browser.toolbar.ButtonData.ButtonSpec;
- @@ -35,10 +33,6 @@ import org.chromium.components.browser_ui.settings.SettingsLauncher;
- import org.chromium.components.feature_engagement.EventConstants;
- import org.chromium.components.feature_engagement.FeatureConstants;
- import org.chromium.components.feature_engagement.Tracker;
- -import org.chromium.components.signin.base.CoreAccountInfo;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
- -import org.chromium.components.signin.identitymanager.PrimaryAccountChangeEvent;
-
- import java.lang.annotation.Retention;
- import java.lang.annotation.RetentionPolicy;
- @@ -47,8 +41,8 @@ import java.lang.annotation.RetentionPolicy;
- * Handles displaying IdentityDisc on toolbar depending on several conditions
- * (user sign-in state, whether NTP is shown)
- */
- -public class IdentityDiscController implements NativeInitObserver, ProfileDataCache.Observer,
- - IdentityManager.Observer, ButtonDataProvider {
- +public class IdentityDiscController implements NativeInitObserver,
- + ButtonDataProvider {
- // Visual state of Identity Disc.
- @Retention(RetentionPolicy.SOURCE)
- @IntDef({IdentityDiscState.NONE, IdentityDiscState.SMALL, IdentityDiscState.LARGE})
- @@ -70,15 +64,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- private final ObservableSupplier<Profile> mProfileSupplier;
- private final Callback<Profile> mProfileSupplierObserver = this::setProfile;
-
- - // We observe IdentityManager to receive primary account state change notifications.
- - private IdentityManager mIdentityManager;
- -
- - // ProfileDataCache facilitates retrieving profile picture. Separate objects are maintained
- - // for different visual states to cache profile pictures of different size.
- - // mProfileDataCache[IdentityDiscState.NONE] should always be null since in this state
- - // Identity Disc is not visible.
- - private ProfileDataCache mProfileDataCache[] = new ProfileDataCache[IdentityDiscState.MAX];
- -
- // Identity disc visibility state.
- @IdentityDiscState
- private int mState = IdentityDiscState.NONE;
- @@ -165,18 +150,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- assert !mButtonData.canShow();
- return;
- }
- -
- - String email = CoreAccountInfo.getEmailFrom(getSignedInAccountInfo());
- - mState = email == null ? IdentityDiscState.NONE : IdentityDiscState.SMALL;
- - ensureProfileDataCache(email, mState);
- -
- - if (mState != IdentityDiscState.NONE) {
- - mButtonData.setButtonSpec(
- - buttonSpecWithDrawable(mButtonData.getButtonSpec(), getProfileImage(email)));
- - mButtonData.setCanShow(true);
- - } else {
- - mButtonData.setCanShow(false);
- - }
- }
-
- private static ButtonSpec buttonSpecWithDrawable(ButtonSpec buttonSpec, Drawable drawable) {
- @@ -191,24 +164,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- * IdentityDiscController for profile data updates.
- */
- private void ensureProfileDataCache(String accountName, @IdentityDiscState int state) {
- - if (state == IdentityDiscState.NONE || mProfileDataCache[state] != null) return;
- -
- - @DimenRes
- - int dimension_id =
- - (state == IdentityDiscState.SMALL) ? R.dimen.toolbar_identity_disc_size
- - : R.dimen.toolbar_identity_disc_size_duet;
- - ProfileDataCache profileDataCache =
- - ProfileDataCache.createWithoutBadge(mContext, dimension_id);
- - profileDataCache.addObserver(this);
- - mProfileDataCache[state] = profileDataCache;
- - }
- -
- - /**
- - * Returns Profile picture Drawable. The size of the image corresponds to current visual state.
- - */
- - private Drawable getProfileImage(String accountName) {
- - assert mState != IdentityDiscState.NONE;
- - return mProfileDataCache[mState].getProfileDataOrDefault(accountName).getImage();
- }
-
- /**
- @@ -216,13 +171,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- * when sign-in state changes.
- */
- private void resetIdentityDiscCache() {
- - for (int i = 0; i < IdentityDiscState.MAX; i++) {
- - if (mProfileDataCache[i] != null) {
- - assert i != IdentityDiscState.NONE;
- - mProfileDataCache[i].removeObserver(this);
- - mProfileDataCache[i] = null;
- - }
- - }
- }
-
- private void notifyObservers(boolean hint) {
- @@ -231,47 +179,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- }
- }
-
- - /**
- - * Called after profile image becomes available. Updates the image on toolbar button.
- - */
- - @Override
- - public void onProfileDataUpdated(String accountEmail) {
- - if (mState == IdentityDiscState.NONE) return;
- - assert mProfileDataCache[mState] != null;
- -
- - if (accountEmail.equals(CoreAccountInfo.getEmailFrom(getSignedInAccountInfo()))) {
- - /**
- - * We need to call {@link notifyObservers(false)} before caling
- - * {@link notifyObservers(true)}. This is because {@link notifyObservers(true)} has been
- - * called in {@link setProfile()}, and without calling {@link notifyObservers(false)},
- - * the ObservableSupplierImpl doesn't propagate the call. See https://cubug.com/1137535.
- - */
- - notifyObservers(false);
- - notifyObservers(true);
- - }
- - }
- -
- - /**
- - * Implements {@link IdentityManager.Observer}.
- - *
- - * IdentityDisc should be shown as long as the user is signed in. Whether the user is syncing
- - * or not should not matter.
- - */
- - @Override
- - public void onPrimaryAccountChanged(PrimaryAccountChangeEvent eventDetails) {
- - switch (eventDetails.getEventTypeFor(ConsentLevel.SIGNIN)) {
- - case PrimaryAccountChangeEvent.Type.SET:
- - resetIdentityDiscCache();
- - notifyObservers(true);
- - break;
- - case PrimaryAccountChangeEvent.Type.CLEARED:
- - notifyObservers(false);
- - break;
- - case PrimaryAccountChangeEvent.Type.NONE:
- - break;
- - }
- - }
- -
- /**
- * Call to tear down dependencies.
- */
- @@ -282,18 +189,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- mActivityLifecycleDispatcher = null;
- }
-
- - for (int i = 0; i < IdentityDiscState.MAX; i++) {
- - if (mProfileDataCache[i] != null) {
- - mProfileDataCache[i].removeObserver(this);
- - mProfileDataCache[i] = null;
- - }
- - }
- -
- - if (mIdentityManager != null) {
- - mIdentityManager.removeObserver(this);
- - mIdentityManager = null;
- - }
- -
- if (mNativeIsInitialized) {
- mProfileSupplier.removeObserver(mProfileSupplierObserver);
- }
- @@ -310,32 +205,10 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
- RecordUserAction.record("MobileToolbarIdentityDiscTap");
- }
-
- - /**
- - * Returns the account info of mIdentityManager if current profile is regular, and
- - * null for off-the-record ones.
- - * @return account info for the current profile. Returns null for OTR profile.
- - */
- - private CoreAccountInfo getSignedInAccountInfo() {
- - return mIdentityManager != null
- - ? mIdentityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN)
- - : null;
- - }
- -
- /**
- * Triggered by mProfileSupplierObserver when profile is changed in mProfileSupplier.
- * mIdentityManager is updated with the profile, as set to null if profile is off-the-record.
- */
- private void setProfile(Profile profile) {
- - if (mIdentityManager != null) {
- - mIdentityManager.removeObserver(this);
- - }
- -
- - if (profile.isOffTheRecord()) {
- - mIdentityManager = null;
- - } else {
- - mIdentityManager = IdentityServicesProvider.get().getIdentityManager(profile);
- - mIdentityManager.addObserver(this);
- - notifyObservers(true);
- - }
- }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java
- @@ -12,29 +12,26 @@ import org.chromium.components.infobars.ConfirmInfoBar;
- import org.chromium.components.infobars.InfoBar;
- import org.chromium.components.infobars.InfoBarControlLayout;
- import org.chromium.components.infobars.InfoBarLayout;
- -import org.chromium.components.signin.base.AccountInfo;
-
- /**
- * The Save Password infobar asks the user whether they want to save the password for the site.
- */
- public class SavePasswordInfoBar extends ConfirmInfoBar {
- private final String mDetailsMessage;
- - private final AccountInfo mAccountInfo;
-
- @CalledByNative
- private static InfoBar show(int iconId, String message, String detailsMessage,
- - String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) {
- + String primaryButtonText, String secondaryButtonText) {
- // If accountInfo is empty, no footer will be shown.
- return new SavePasswordInfoBar(iconId, message, detailsMessage, primaryButtonText,
- - secondaryButtonText, accountInfo);
- + secondaryButtonText);
- }
-
- private SavePasswordInfoBar(int iconDrawbleId, String message, String detailsMessage,
- - String primaryButtonText, String secondaryButtonText, AccountInfo accountInfo) {
- + String primaryButtonText, String secondaryButtonText) {
- super(iconDrawbleId, R.color.infobar_icon_drawable_color, null, message, null,
- primaryButtonText, secondaryButtonText);
- mDetailsMessage = detailsMessage;
- - mAccountInfo = accountInfo;
- }
-
- @Override
- @@ -44,11 +41,5 @@ public class SavePasswordInfoBar extends ConfirmInfoBar {
- InfoBarControlLayout detailsMessageLayout = layout.addControlLayout();
- detailsMessageLayout.addDescription(mDetailsMessage);
- }
- -
- - if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail())
- - && mAccountInfo.getAccountImage() != null) {
- - layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter(
- - layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail()));
- - }
- }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/UpdatePasswordInfoBar.java
- @@ -14,7 +14,6 @@ import org.chromium.components.infobars.InfoBar;
- import org.chromium.components.infobars.InfoBarControlLayout;
- import org.chromium.components.infobars.InfoBarControlLayout.InfoBarArrayAdapter;
- import org.chromium.components.infobars.InfoBarLayout;
- -import org.chromium.components.signin.base.AccountInfo;
-
- /**
- * The Update Password infobar offers the user the ability to update a password for the site.
- @@ -23,27 +22,23 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar {
- private final String[] mUsernames;
- private final int mUsernameIndex;
- private final String mDetailsMessage;
- - private final AccountInfo mAccountInfo;
- private Spinner mUsernamesSpinner;
-
- @CalledByNative
- private static InfoBar show(int iconId, String[] usernames, int selectedUsername,
- - String message, String detailsMessage, String primaryButtonText,
- - AccountInfo accountInfo) {
- + String message, String detailsMessage, String primaryButtonText) {
- // If accountInfo is empty, no footer will be shown.
- return new UpdatePasswordInfoBar(iconId, usernames, selectedUsername, message,
- - detailsMessage, primaryButtonText, accountInfo);
- + detailsMessage, primaryButtonText);
- }
-
- private UpdatePasswordInfoBar(int iconDrawableId, String[] usernames, int selectedUsername,
- - String message, String detailsMessage, String primaryButtonText,
- - AccountInfo accountInfo) {
- + String message, String detailsMessage, String primaryButtonText) {
- super(iconDrawableId, R.color.infobar_icon_drawable_color, null, message, null,
- primaryButtonText, null);
- mDetailsMessage = detailsMessage;
- mUsernames = usernames;
- mUsernameIndex = selectedUsername;
- - mAccountInfo = accountInfo;
- }
-
- @Override
- @@ -65,12 +60,6 @@ public class UpdatePasswordInfoBar extends ConfirmInfoBar {
- InfoBarControlLayout detailsMessageLayout = layout.addControlLayout();
- detailsMessageLayout.addDescription(mDetailsMessage);
- }
- -
- - if (mAccountInfo != null && !TextUtils.isEmpty(mAccountInfo.getEmail())
- - && mAccountInfo.getAccountImage() != null) {
- - layout.addFooterView(PasswordInfoBarUtils.createAccountIndicationFooter(
- - layout.getContext(), mAccountInfo.getAccountImage(), mAccountInfo.getEmail()));
- - }
- }
-
- @CalledByNative
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
- @@ -37,7 +37,6 @@ import org.chromium.chrome.browser.download.DownloadManagerService;
- import org.chromium.chrome.browser.flags.ChromeSwitches;
- import org.chromium.chrome.browser.language.GlobalAppLocaleController;
- import org.chromium.chrome.browser.metrics.UmaUtils;
- -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
- import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
- import org.chromium.components.background_task_scheduler.BackgroundTaskSchedulerFactory;
- import org.chromium.components.crash.browser.ChildProcessCrashObserver;
- @@ -360,7 +359,6 @@ public class ChromeBrowserInitializer {
- LibraryPrefetcher.asyncPrefetchLibrariesToMemory();
- getBrowserStartupController().startBrowserProcessesSync(
- LibraryProcessType.PROCESS_BROWSER, /*singleProcess=*/false);
- - SigninCheckerProvider.get();
- } finally {
- TraceEvent.end("ChromeBrowserInitializer.startChromeBrowserProcessesSync");
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java
- @@ -82,7 +82,6 @@ import org.chromium.chrome.browser.quickactionsearchwidget.QuickActionSearchWidg
- import org.chromium.chrome.browser.rlz.RevenueStats;
- import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
- import org.chromium.chrome.browser.sharing.shared_clipboard.SharedClipboardShareActivity;
- -import org.chromium.chrome.browser.signin.SigninCheckerProvider;
- import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData;
- import org.chromium.chrome.browser.tasks.tab_management.PriceTrackingUtilities;
- import org.chromium.chrome.browser.ui.searchactivityutils.SearchActivityPreferencesManager;
- @@ -196,11 +195,6 @@ public class ProcessInitializationHandler {
-
- Context application = ContextUtils.getApplicationContext();
-
- - // Initialize the AccountManagerFacade with the correct AccountManagerDelegate. Must be done
- - // only once and before AccountManagerFacadeProvider.getInstance() is invoked.
- - AccountManagerFacadeProvider.setInstance(
- - new AccountManagerFacadeImpl(AppHooks.get().createAccountManagerDelegate()));
- -
- // For ANR uploading - we set the version number so that when we ask Android for our ANRs,
- // it can also give us the version it happened on. This helps in the case that before we can
- // report the ANR, our app gets updated.
- @@ -398,7 +392,6 @@ public class ProcessInitializationHandler {
- deferredStartupHandler.addDeferredTask(new Runnable() {
- @Override
- public void run() {
- - SigninCheckerProvider.get().onMainActivityStart();
- RevenueStats.getInstance();
- }
- });
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
- @@ -15,22 +15,12 @@ import org.chromium.chrome.browser.invalidation.SessionsInvalidationManager;
- import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
- import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.ProfileDataCache;
- -import org.chromium.chrome.browser.signin.services.SigninManager;
- -import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tabmodel.TabModel;
- import org.chromium.chrome.browser.tabmodel.TabModelSelector;
- import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
- import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
- -import org.chromium.chrome.browser.ui.signin.PersonalizedSigninPromoView;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
- import org.chromium.components.signin.AccountManagerFacadeProvider;
- -import org.chromium.components.signin.AccountsChangeObserver;
- import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.components.signin.metrics.SigninAccessPoint;
- import org.chromium.url.GURL;
- @@ -42,8 +32,7 @@ import java.util.Map;
- /**
- * Provides the domain logic and data for RecentTabsPage and RecentTabsRowAdapter.
- */
- -public class RecentTabsManager implements SyncService.SyncStateChangedListener, SignInStateObserver,
- - ProfileDataCache.Observer, AccountsChangeObserver {
- +public class RecentTabsManager {
- /**
- * Implement this to receive updates when the page contents change.
- */
- @@ -64,21 +53,15 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- private final Runnable mShowHistoryManager;
-
- private TabModel mTabModel;
- - private @SyncPromoState int mPromoState = SyncPromoState.NO_PROMO;
- private FaviconHelper mFaviconHelper;
- private ForeignSessionHelper mForeignSessionHelper;
- private List<ForeignSession> mForeignSessions;
- private List<RecentlyClosedEntry> mRecentlyClosedEntries;
- private RecentTabsPagePrefs mPrefs;
- private RecentlyClosedTabManager mRecentlyClosedTabManager;
- - private SigninManager mSignInManager;
- private UpdatedCallback mUpdatedCallback;
- private boolean mIsDestroyed;
-
- - private final ProfileDataCache mProfileDataCache;
- - private final SigninPromoController mSigninPromoController;
- - private final SyncService mSyncService;
- -
- /**
- * Maps Session IDs to whether that entry was restored split by entry type. These are used to
- * record historgrams on {@link #destroy()} to measure restore ratio. Cached Session IDs are
- @@ -110,12 +93,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- mRecentlyClosedTabManager = sRecentlyClosedTabManagerForTests != null
- ? sRecentlyClosedTabManagerForTests
- : new RecentlyClosedBridge(profile, tabModelSelector);
- - mSignInManager = IdentityServicesProvider.get().getSigninManager(mProfile);
- -
- - mProfileDataCache = ProfileDataCache.createWithDefaultImageSizeAndNoBadge(context);
- - mSigninPromoController = new SigninPromoController(
- - SigninAccessPoint.RECENT_TABS, SyncConsentActivityLauncherImpl.get());
- - mSyncService = SyncService.get();
-
- mRecentlyClosedTabManager.setEntriesUpdatedRunnable(this::updateRecentlyClosedEntries);
- updateRecentlyClosedEntries();
- @@ -124,12 +101,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- updateForeignSessions();
- mForeignSessionHelper.triggerSessionSync();
-
- - mSyncService.addSyncStateChangedListener(this);
- - mSignInManager.addSignInStateObserver(this);
- - mProfileDataCache.addObserver(this);
- - AccountManagerFacadeProvider.getInstance().addObserver(this);
- - updatePromoState();
- -
- SessionsInvalidationManager.get(mProfile).onRecentTabsPageOpened();
- }
-
- @@ -167,14 +138,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- recordEntries("Group", mGroupSessionIdsRestored);
- recordEntries("Bulk", mBulkSessionIdsRestored);
-
- - mSyncService.removeSyncStateChangedListener(this);
- -
- - mSignInManager.removeSignInStateObserver(this);
- - mSignInManager = null;
- -
- - mProfileDataCache.removeObserver(this);
- - AccountManagerFacadeProvider.getInstance().removeObserver(this);
- -
- mFaviconHelper.destroy();
- mFaviconHelper = null;
-
- @@ -419,80 +382,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- return mPrefs.getSyncPromoCollapsed();
- }
-
- - /** Returns the current promo state. */
- - @SyncPromoState
- - int getPromoState() {
- - return mPromoState;
- - }
- -
- - private @SyncPromoState int calculatePromoState() {
- - if (!mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SYNC)) {
- - if (!mSignInManager.isSyncOptInAllowed()) {
- - return SyncPromoState.NO_PROMO;
- - }
- - if (mSignInManager.getIdentityManager().hasPrimaryAccount(ConsentLevel.SIGNIN)) {
- - return SyncPromoState.PROMO_FOR_SIGNED_IN_STATE;
- - }
- - return SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE;
- - }
- -
- - if (mSyncService.isSyncRequested() && !mForeignSessions.isEmpty()) {
- - return SyncPromoState.NO_PROMO;
- - }
- - return SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE;
- - }
- -
- - private void updatePromoState() {
- - final @SyncPromoState int newState = calculatePromoState();
- - if (newState == mPromoState) return;
- -
- - final boolean hasSyncPromoStateChangedtoShown =
- - (mPromoState == SyncPromoState.NO_PROMO
- - || mPromoState == SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE)
- - && (newState == SyncPromoState.PROMO_FOR_SIGNED_IN_STATE
- - || newState == SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE);
- - if (hasSyncPromoStateChangedtoShown) {
- - mSigninPromoController.increasePromoShowCount();
- - }
- - mPromoState = newState;
- - }
- -
- - /**
- - * Sets up the sync promo view.
- - */
- - void setUpSyncPromoView(PersonalizedSigninPromoView view) {
- - mSigninPromoController.setUpSyncPromoView(mProfileDataCache, view, null);
- - }
- -
- - // SignInStateObserver implementation.
- - @Override
- - public void onSignedIn() {
- - update();
- - }
- -
- - @Override
- - public void onSignedOut() {
- - update();
- - }
- -
- - // AccountsChangeObserver implementation.
- - @Override
- - public void onAccountsChanged() {
- - update();
- - }
- -
- - // ProfileDataCache.Observer implementation.
- - @Override
- - public void onProfileDataUpdated(String accountEmail) {
- - update();
- - }
- -
- - // SyncService.SyncStateChangedListener implementation.
- - @Override
- - public void syncStateChanged() {
- - update();
- - }
- -
- private void onUpdateDone() {
- if (mUpdatedCallback != null) {
- mUpdatedCallback.onUpdated();
- @@ -500,7 +389,6 @@ public class RecentTabsManager implements SyncService.SyncStateChangedListener,
- }
-
- private void update() {
- - updatePromoState();
- if (mIsDestroyed) return;
- updateForeignSessions();
- onUpdateDone();
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsRowAdapter.java
- @@ -31,15 +31,12 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSession;
- import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionTab;
- import org.chromium.chrome.browser.ntp.ForeignSessionHelper.ForeignSessionWindow;
- -import org.chromium.chrome.browser.signin.SyncPromoView;
- import org.chromium.chrome.browser.ui.favicon.FaviconHelper.DefaultFaviconHelper;
- import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
- import org.chromium.chrome.browser.ui.favicon.FaviconUtils;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoController.SyncPromoState;
- import org.chromium.components.browser_ui.styles.SemanticColorUtils;
- import org.chromium.components.browser_ui.widget.RoundedIconGenerator;
- import org.chromium.components.embedder_support.util.UrlUtilities;
- -import org.chromium.components.signin.metrics.SigninAccessPoint;
- import org.chromium.ui.base.DeviceFormFactor;
- import org.chromium.ui.mojom.WindowOpenDisposition;
- import org.chromium.url.GURL;
- @@ -432,38 +429,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
- }
- }
-
- - /** A group containing the personalized sync promo. */
- - class PersonalizedSyncPromoGroup extends PromoGroup {
- - private final @ChildType int mChildType;
- -
- - PersonalizedSyncPromoGroup(@ChildType int childType) {
- - assert childType == ChildType.PERSONALIZED_SIGNIN_PROMO
- - || childType
- - == ChildType.PERSONALIZED_SYNC_PROMO : "Unsupported child type:"
- - + childType;
- - mChildType = childType;
- - }
- -
- - @Override
- - @ChildType
- - int getChildType() {
- - return mChildType;
- - }
- -
- - @Override
- - View getChildView(
- - int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
- - if (convertView == null) {
- - LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
- - convertView = layoutInflater.inflate(
- - R.layout.personalized_signin_promo_view_recent_tabs, parent, false);
- - }
- - mRecentTabsManager.setUpSyncPromoView(
- - convertView.findViewById(R.id.signin_promo_view_container));
- - return convertView;
- - }
- - }
- -
- /**
- * A group containing the sync promo.
- */
- @@ -476,9 +441,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
- @Override
- View getChildView(
- int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
- - if (convertView == null) {
- - convertView = SyncPromoView.create(parent, SigninAccessPoint.RECENT_TABS);
- - }
- return convertView;
- }
- }
- @@ -904,22 +866,6 @@ public class RecentTabsRowAdapter extends BaseExpandableListAdapter {
- addGroup(new ForeignSessionGroup(session));
- }
-
- - switch (mRecentTabsManager.getPromoState()) {
- - case SyncPromoState.NO_PROMO:
- - break;
- - case SyncPromoState.PROMO_FOR_SIGNED_OUT_STATE:
- - addGroup(new PersonalizedSyncPromoGroup(ChildType.PERSONALIZED_SIGNIN_PROMO));
- - break;
- - case SyncPromoState.PROMO_FOR_SIGNED_IN_STATE:
- - addGroup(new PersonalizedSyncPromoGroup(ChildType.PERSONALIZED_SYNC_PROMO));
- - break;
- - case SyncPromoState.PROMO_FOR_SYNC_TURNED_OFF_STATE:
- - addGroup(new SyncPromoGroup());
- - break;
- - default:
- - assert false : "Unexpected value for promo type!";
- - }
- -
- // Add separator line after the recently closed tabs group.
- int recentlyClosedIndex = mGroups.indexOf(mRecentlyClosedTabsGroup);
- if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/SearchBoxMediator.java
- @@ -25,7 +25,6 @@ import org.chromium.chrome.browser.omnibox.voice.AssistantVoiceSearchService;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.ui.theme.BrandedColorScheme;
- import org.chromium.components.externalauth.ExternalAuthUtils;
- import org.chromium.components.signin.AccountManagerFacadeProvider;
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/omaha/RequestGenerator.java
- @@ -40,9 +40,6 @@ public abstract class RequestGenerator {
-
- protected RequestGenerator(Context context) {
- mApplicationContext = context.getApplicationContext();
- - UniqueIdentificationGeneratorFactory.registerGenerator(
- - SettingsSecureBasedIdentificationGenerator.GENERATOR_ID,
- - new SettingsSecureBasedIdentificationGenerator(getContext()), false);
- }
-
- /**
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/AccountChooserDialog.java
- @@ -128,7 +128,7 @@ public class AccountChooserDialog
- Drawable avatar = credential.getAvatar();
- if (avatar == null) {
- avatar = AppCompatResources.getDrawable(
- - getContext(), R.drawable.logo_avatar_anonymous);
- + getContext(), R.drawable.omnibox_info);
- }
- avatarView.setImageDrawable(avatar);
-
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerLauncher.java
- @@ -11,7 +11,6 @@ import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.base.supplier.ObservableSupplierImpl;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.content_public.browser.WebContents;
- import org.chromium.ui.base.WindowAndroid;
- import org.chromium.ui.modaldialog.ModalDialogManager;
- @@ -32,20 +31,8 @@ public class PasswordManagerLauncher {
- public static void showPasswordSettings(Activity activity,
- @ManagePasswordsReferrer int referrer,
- ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
- - SyncService syncService = SyncService.get();
- - if (syncService.isEngineInitialized()
- - && PasswordManagerHelper.hasChosenToSyncPasswordsWithNoCustomPassphrase(syncService)
- - && (ChromeFeatureList.isEnabled(ChromeFeatureList.PASSWORD_SCRIPTS_FETCHING)
- - || ChromeFeatureList.isEnabled(
- - ChromeFeatureList.PASSWORD_DOMAIN_CAPABILITIES_FETCHING))) {
- - PasswordScriptsFetcherBridge.prewarmCache();
- - }
- - CredentialManagerLauncher credentialManagerLauncher =
- - PasswordManagerHelper.usesUnifiedPasswordManagerUI()
- - ? CredentialManagerLauncherFactory.getInstance().createLauncher()
- - : null;
- PasswordManagerHelper.showPasswordSettings(activity, referrer, new SettingsLauncherImpl(),
- - credentialManagerLauncher, syncService, modalDialogManagerSupplier);
- + null, modalDialogManagerSupplier);
- }
-
- @CalledByNative
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
- @@ -40,8 +40,6 @@ import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- -import org.chromium.chrome.browser.sync.SyncService;
- -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
- import org.chromium.components.browser_ui.settings.ChromeBasePreference;
- import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
- import org.chromium.components.browser_ui.settings.SearchUtils;
- @@ -68,7 +66,7 @@ import org.chromium.chrome.browser.ApplicationLifetime;
- */
- public class PasswordSettings extends PreferenceFragmentCompat
- implements PasswordManagerHandler.PasswordListObserver,
- - Preference.OnPreferenceClickListener, SyncService.SyncStateChangedListener,
- + Preference.OnPreferenceClickListener,
- INeedSnackbarManager {
- @IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN,
- TrustedVaultBannerState.OPTED_IN})
- @@ -176,10 +174,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
- setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getStyledContext()));
- PasswordManagerHandlerProvider.getInstance().addObserver(this);
-
- - if (SyncService.get() != null) {
- - SyncService.get().addSyncStateChangedListener(this);
- - }
- -
- setHasOptionsMenu(true); // Password Export might be optional but Search is always present.
-
- mManagePasswordsReferrer = getReferrerFromInstanceStateOrLaunchBundle(savedInstanceState);
- @@ -487,9 +481,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
- public void onDestroy() {
- super.onDestroy();
-
- - if (SyncService.get() != null) {
- - SyncService.get().removeSyncStateChangedListener(this);
- - }
- // The component should only be destroyed when the activity has been closed by the user
- // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
- // by the system.
- @@ -667,34 +658,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
- }
-
- private void displayManageAccountLink() {
- - SyncService syncService = SyncService.get();
- - if (syncService == null || !syncService.isEngineInitialized()) {
- - return;
- - }
- - if (!PasswordManagerHelper.isSyncingPasswordsWithNoCustomPassphrase(SyncService.get())) {
- - return;
- - }
- - if (mSearchQuery != null && !mNoPasswords) {
- - return; // Don't add the Manage Account link if there is a search going on.
- - }
- - if (getPreferenceScreen().findPreference(PREF_KEY_MANAGE_ACCOUNT_LINK) != null) {
- - return; // Don't add the Manage Account link if it's present.
- - }
- - if (mLinkPref != null) {
- - // If we created the link before, reuse it.
- - getPreferenceScreen().addPreference(mLinkPref);
- - return;
- - }
- - ForegroundColorSpan colorSpan =
- - new ForegroundColorSpan(SemanticColorUtils.getDefaultTextColorLink(getContext()));
- - SpannableString title = SpanApplier.applySpans(getString(R.string.manage_passwords_text),
- - new SpanApplier.SpanInfo("<link>", "</link>", colorSpan));
- - mLinkPref = new ChromeBasePreference(getStyledContext());
- - mLinkPref.setKey(PREF_KEY_MANAGE_ACCOUNT_LINK);
- - mLinkPref.setTitle(title);
- - mLinkPref.setOnPreferenceClickListener(this);
- - mLinkPref.setOrder(ORDER_MANAGE_ACCOUNT_LINK);
- - getPreferenceScreen().addPreference(mLinkPref);
- }
-
- private Context getStyledContext() {
- @@ -705,43 +668,11 @@ public class PasswordSettings extends PreferenceFragmentCompat
- return UserPrefs.get(Profile.getLastUsedRegularProfile());
- }
-
- - @Override
- - public void syncStateChanged() {
- - final @TrustedVaultBannerState int oldTrustedVaultBannerState = mTrustedVaultBannerState;
- - computeTrustedVaultBannerState();
- - if (oldTrustedVaultBannerState != mTrustedVaultBannerState) {
- - rebuildPasswordLists();
- - }
- - }
- -
- private void computeTrustedVaultBannerState() {
- - final SyncService syncService = SyncService.get();
- - if (syncService == null) {
- - mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
- - return;
- - }
- - if (!syncService.isEngineInitialized()) {
- - // Can't call getPassphraseType() yet.
- mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
- - return;
- - }
- - if (syncService.getPassphraseType() == PassphraseType.TRUSTED_VAULT_PASSPHRASE) {
- - mTrustedVaultBannerState = TrustedVaultBannerState.OPTED_IN;
- - return;
- - }
- - if (syncService.shouldOfferTrustedVaultOptIn()) {
- - mTrustedVaultBannerState = TrustedVaultBannerState.OFFER_OPT_IN;
- - return;
- - }
- - mTrustedVaultBannerState = TrustedVaultBannerState.NOT_SHOWN;
- }
-
- private boolean openTrustedVaultOptInDialog(Preference unused) {
- - assert SyncService.get() != null;
- - CoreAccountInfo accountInfo = SyncService.get().getAccountInfo();
- - assert accountInfo != null;
- - SyncSettingsUtils.openTrustedVaultOptInDialog(
- - this, accountInfo, REQUEST_CODE_TRUSTED_VAULT_OPT_IN);
- // Return true to notify the click was handled.
- return true;
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/PaymentRequestUI.java
- @@ -45,7 +45,6 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.OptionSecti
- import org.chromium.chrome.browser.payments.ui.PaymentRequestSection.SectionSeparator;
- import org.chromium.chrome.browser.payments.ui.PaymentUiService.PaymentUisShowStateReconciler;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.components.autofill.EditableOption;
- import org.chromium.components.autofill.prefeditor.EditorObserverForTest;
- import org.chromium.components.browser_ui.widget.FadingEdgeScrollView;
- @@ -1171,16 +1170,7 @@ public class PaymentRequestUI implements DimmingDialog.OnDismissListener, View.O
- */
- @Nullable
- private String getSignedInUsersEmail() {
- - if (mProfile.isOffTheRecord()) {
- return null;
- - }
- -
- - IdentityManager identityManager =
- - IdentityServicesProvider.get().getIdentityManager(mProfile);
- - if (identityManager == null) return null;
- - CoreAccountInfo info = identityManager.getPrimaryAccountInfo(ConsentLevel.SYNC);
- - if (info == null) return null;
- - return info.getEmail();
- }
-
- private Callback<SectionInformation> createUpdateSectionCallback(@DataType final int type) {
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
- @@ -34,9 +34,6 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragmen
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
- import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
- -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
- import org.chromium.components.browser_ui.settings.SpinnerPreference;
- @@ -67,7 +64,6 @@ public class PrivacySettings
- private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
- private static final String PREF_SECURE_DNS = "secure_dns";
- private static final String PREF_DO_NOT_TRACK = "do_not_track";
- - private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
- private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
- private static final String PREF_PROXY_OPTIONS = "proxy";
- private static final String PREF_PRIVACY_REVIEW = "privacy_review";
- @@ -142,9 +138,6 @@ public class PrivacySettings
- Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
- secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
-
- - Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
- - syncAndServicesLink.setSummary(buildSyncAndServicesLink());
- -
- // set up history expire days threshold preference
- List<TimeFrequencySpinnerOption> options = new ArrayList<>();
- options.add(new TimeFrequencySpinnerOption(0,
- @@ -182,30 +175,6 @@ public class PrivacySettings
- updatePreferences();
- }
-
- - private SpannableString buildSyncAndServicesLink() {
- - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- - NoUnderlineClickableSpan servicesLink = new NoUnderlineClickableSpan(getContext(), v -> {
- - settingsLauncher.launchSettingsActivity(getActivity(), GoogleServicesSettings.class);
- - });
- - if (IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .getPrimaryAccountInfo(ConsentLevel.SYNC)
- - == null) {
- - // Sync is off, show the string with one link to "Google Services".
- - return SpanApplier.applySpans(
- - getString(R.string.privacy_sync_and_services_link_sync_off),
- - new SpanApplier.SpanInfo("<link>", "</link>", servicesLink));
- - }
- - // Otherwise, show the string with both links to "Sync" and "Google Services".
- - NoUnderlineClickableSpan syncLink = new NoUnderlineClickableSpan(getContext(), v -> {
- - settingsLauncher.launchSettingsActivity(getActivity(), ManageSyncSettings.class,
- - ManageSyncSettings.createArguments(false));
- - });
- - return SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link_sync_on),
- - new SpanApplier.SpanInfo("<link1>", "</link1>", syncLink),
- - new SpanApplier.SpanInfo("<link2>", "</link2>", servicesLink));
- - }
- -
- public static final String PREF_ALLOW_CUSTOM_TAB_INTENTS = "allow_custom_tab_intents";
- public static final String PREF_OPEN_EXTERNAL_LINKS_INCOGNITO = "open_external_links_incognito";
-
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSettings.java
- @@ -4,7 +4,6 @@
-
- package org.chromium.chrome.browser.settings;
-
- -import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.hasChosenToSyncPasswords;
- import static org.chromium.chrome.browser.password_manager.PasswordManagerHelper.usesUnifiedPasswordManagerUI;
-
- import android.content.Context;
- @@ -37,15 +36,6 @@ import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
- -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.SigninManager;
- -import org.chromium.chrome.browser.sync.SyncService;
- -import org.chromium.chrome.browser.sync.settings.ManageSyncSettings;
- -import org.chromium.chrome.browser.sync.settings.SignInPreference;
- -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference;
- -import org.chromium.chrome.browser.sync.settings.SyncPromoPreference.State;
- -import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
- import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarFeatures;
- import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarStatePredictor;
- import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
- @@ -70,14 +60,10 @@ import java.util.Map;
- * The main settings screen, shown when the user first opens Settings.
- */
- public class MainSettings extends PreferenceFragmentCompat
- - implements TemplateUrlService.LoadListener, SyncService.SyncStateChangedListener,
- - SigninManager.SignInStateObserver {
- - public static final String PREF_SYNC_PROMO = "sync_promo";
- + implements TemplateUrlService.LoadListener {
- public static final String PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION =
- "account_and_google_services_section";
- public static final String PREF_SIGN_IN = "sign_in";
- - public static final String PREF_MANAGE_SYNC = "manage_sync";
- - public static final String PREF_GOOGLE_SERVICES = "google_services";
- public static final String PREF_SEARCH_ENGINE = "search_engine";
- public static final String PREF_PASSWORDS = "passwords";
- public static final String PREF_HOMEPAGE = "homepage";
- @@ -95,9 +81,6 @@ public class MainSettings extends PreferenceFragmentCompat
-
- private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
- private final Map<String, Preference> mAllPreferences = new HashMap<>();
- - private SyncPromoPreference mSyncPromoPreference;
- - private SignInPreference mSignInPreference;
- - private ChromeBasePreference mManageSync;
- private @Nullable PasswordCheck mPasswordCheck;
- private ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
-
- @@ -129,41 +112,12 @@ public class MainSettings extends PreferenceFragmentCompat
- @Override
- public void onDestroy() {
- super.onDestroy();
- - mSyncPromoPreference.onPreferenceFragmentDestroyed();
- // The component should only be destroyed when the activity has been closed by the user
- // (e.g. by pressing on the back button) and not when the activity is temporarily destroyed
- // by the system.
- if (getActivity().isFinishing() && mPasswordCheck != null) PasswordCheckFactory.destroy();
- }
-
- - @Override
- - public void onStart() {
- - super.onStart();
- - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
- - Profile.getLastUsedRegularProfile());
- - if (signinManager.isSigninSupported()) {
- - signinManager.addSignInStateObserver(this);
- - }
- - SyncService syncService = SyncService.get();
- - if (syncService != null) {
- - syncService.addSyncStateChangedListener(this);
- - }
- - }
- -
- - @Override
- - public void onStop() {
- - super.onStop();
- - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
- - Profile.getLastUsedRegularProfile());
- - if (signinManager.isSigninSupported()) {
- - signinManager.removeSignInStateObserver(this);
- - }
- - SyncService syncService = SyncService.get();
- - if (syncService != null) {
- - syncService.removeSyncStateChangedListener(this);
- - }
- - }
- -
- @Override
- public void onResume() {
- super.onResume();
- @@ -175,8 +129,6 @@ public class MainSettings extends PreferenceFragmentCompat
-
- cachePreferences();
-
- - mSyncPromoPreference.setOnStateChangedCallback(this::onSyncPromoPreferenceStateChanged);
- -
- updatePasswordsPreference();
-
- if (usesUnifiedPasswordManagerUI()) {
- @@ -228,9 +180,6 @@ public class MainSettings extends PreferenceFragmentCompat
- Preference preference = getPreferenceScreen().getPreference(index);
- mAllPreferences.put(preference.getKey(), preference);
- }
- - mSyncPromoPreference = (SyncPromoPreference) mAllPreferences.get(PREF_SYNC_PROMO);
- - mSignInPreference = (SignInPreference) mAllPreferences.get(PREF_SIGN_IN);
- - mManageSync = (ChromeBasePreference) findPreference(PREF_MANAGE_SYNC);
- }
-
- private void setManagedPreferenceDelegateForPreference(String key) {
- @@ -239,15 +188,6 @@ public class MainSettings extends PreferenceFragmentCompat
- }
-
- private void updatePreferences() {
- - if (IdentityServicesProvider.get()
- - .getSigninManager(Profile.getLastUsedRegularProfile())
- - .isSigninSupported()) {
- - addPreferenceIfAbsent(PREF_SIGN_IN);
- - } else {
- - removePreferenceIfPresent(PREF_SIGN_IN);
- - }
- -
- - updateManageSyncPreference();
- updateSearchEnginePreference();
- updatePasswordsPreference();
-
- @@ -281,37 +221,6 @@ public class MainSettings extends PreferenceFragmentCompat
- if (preference != null) getPreferenceScreen().removePreference(preference);
- }
-
- - private void updateManageSyncPreference() {
- - String primaryAccountName = CoreAccountInfo.getEmailFrom(
- - IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .getPrimaryAccountInfo(ConsentLevel.SIGNIN));
- - boolean showManageSync = primaryAccountName != null;
- - mManageSync.setVisible(showManageSync);
- - if (!showManageSync) return;
- -
- - boolean isSyncConsentAvailable =
- - IdentityServicesProvider.get()
- - .getIdentityManager(Profile.getLastUsedRegularProfile())
- - .getPrimaryAccountInfo(ConsentLevel.SYNC)
- - != null;
- - mManageSync.setIcon(SyncSettingsUtils.getSyncStatusIcon(getActivity()));
- - mManageSync.setSummary(SyncSettingsUtils.getSyncStatusSummary(getActivity()));
- - mManageSync.setOnPreferenceClickListener(pref -> {
- - Context context = getContext();
- - if (SyncService.get().isSyncDisabledByEnterprisePolicy()) {
- - SyncSettingsUtils.showSyncDisabledByAdministratorToast(context);
- - } else if (isSyncConsentAvailable) {
- - SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- - settingsLauncher.launchSettingsActivity(context, ManageSyncSettings.class);
- - } else {
- - SyncConsentActivityLauncherImpl.get().launchActivityForPromoDefaultFlow(
- - context, SigninAccessPoint.SETTINGS, primaryAccountName);
- - }
- - return true;
- - });
- - }
- -
- private void updateSearchEnginePreference() {
- if (!TemplateUrlServiceFactory.get().isLoaded()) {
- ChromeBasePreference searchEnginePref =
- @@ -348,9 +257,7 @@ public class MainSettings extends PreferenceFragmentCompat
- }
-
- private boolean shouldShowNewLabelForPasswordsPreference() {
- - return usesUnifiedPasswordManagerUI() && hasChosenToSyncPasswords(SyncService.get())
- - && !UserPrefs.get(Profile.getLastUsedRegularProfile())
- - .getBoolean(Pref.PASSWORDS_PREF_WITH_NEW_LABEL_USED);
- + return false;
- }
-
- // TODO(crbug.com/1217070): remove this method once UPM feature is rolled out.
- @@ -381,28 +288,6 @@ public class MainSettings extends PreferenceFragmentCompat
- pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
- }
-
- - // SigninManager.SignInStateObserver implementation.
- - @Override
- - public void onSignedIn() {
- - // After signing in or out of a managed account, preferences may change or become enabled
- - // or disabled.
- - new Handler().post(() -> updatePreferences());
- - }
- -
- - @Override
- - public void onSignedOut() {
- - updatePreferences();
- - }
- -
- - private void onSyncPromoPreferenceStateChanged() {
- - // Remove "Account" section header if the personalized sign-in promo is shown.
- - boolean isShowingPersonalizedSigninPromo =
- - mSyncPromoPreference.getState() == State.PERSONALIZED_SIGNIN_PROMO;
- - findPreference(PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION)
- - .setVisible(!isShowingPersonalizedSigninPromo);
- - mSignInPreference.setIsShowingPersonalizedSigninPromo(isShowingPersonalizedSigninPromo);
- - }
- -
- // TemplateUrlService.LoadListener implementation.
- @Override
- public void onTemplateUrlServiceLoaded() {
- @@ -410,12 +295,6 @@ public class MainSettings extends PreferenceFragmentCompat
- updateSearchEnginePreference();
- }
-
- - @Override
- - public void syncStateChanged() {
- - updateManageSyncPreference();
- - updatePasswordsPreference();
- - }
- -
- @VisibleForTesting
- public ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
- return mManagedPreferenceDelegate;
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
- @@ -63,7 +63,6 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckCoordinator;
- import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
- import org.chromium.chrome.browser.safety_check.SafetyCheckUpdatesDelegateImpl;
- import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
- -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
- import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
- import org.chromium.chrome.browser.ui.messages.snackbar.INeedSnackbarManager;
- import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
- @@ -376,17 +375,7 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
- HelpAndFeedbackLauncherImpl.getInstance());
- }
- if (fragment instanceof SafetyCheckSettingsFragment) {
- - PasswordCheckupClientHelper checkupHelper = null;
- - if (PasswordManagerHelper.canUseUpmCheckup()) {
- - // At this point it can still happen that the helper cannot be created.
- - // In this case, the helper will be null. Safety Check knows to handle
- - // that correctly.
- - checkupHelper = PasswordCheckupClientHelperFactory.getInstance().createHelper();
- - }
- - SafetyCheckCoordinator.create((SafetyCheckSettingsFragment) fragment,
- - new SafetyCheckUpdatesDelegateImpl(this), mSettingsLauncher,
- - SyncConsentActivityLauncherImpl.get(), checkupHelper,
- - getModalDialogManagerSupplier());
- + // not supported
- }
- if (fragment instanceof PasswordCheckFragmentView) {
- PasswordCheckComponentUiFactory.create((PasswordCheckFragmentView) fragment,
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java
- @@ -26,7 +26,6 @@ import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
- import org.chromium.chrome.browser.sharing.SharingAdapter;
- import org.chromium.chrome.browser.sharing.SharingServiceProxy;
- import org.chromium.chrome.browser.sharing.SharingServiceProxy.DeviceInfo;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.components.browser_ui.settings.SettingsLauncher;
- import org.chromium.components.sync.protocol.SharingSpecificFields;
- import org.chromium.ui.widget.ButtonCompat;
- @@ -77,13 +76,11 @@ public class SharedClipboardShareActivity
- mask.setOnClickListener(v -> finish());
-
- ButtonCompat chromeSettingsButton = findViewById(R.id.chrome_settings);
- - if (SyncService.get() == null || !SyncService.get().isSyncRequested()) {
- chromeSettingsButton.setVisibility(View.VISIBLE);
- chromeSettingsButton.setOnClickListener(view -> {
- SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- settingsLauncher.launchSettingsActivity(ContextUtils.getApplicationContext());
- });
- - }
-
- onInitialLayoutInflationComplete();
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
- @@ -78,7 +78,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
- import org.chromium.chrome.browser.share.crow.CrowButtonDelegateImpl;
- import org.chromium.chrome.browser.share.crow.CrowIphController;
- import org.chromium.chrome.browser.share.link_to_text.LinkToTextIPHController;
- -import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
- import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsService;
- import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory;
- @@ -99,7 +98,6 @@ import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate;
- import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
- import org.chromium.chrome.browser.ui.default_browser_promo.DefaultBrowserPromoUtils;
- import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
- -import org.chromium.chrome.browser.ui.signin.SigninPromoUtil;
- import org.chromium.chrome.browser.ui.system.StatusBarColorController.StatusBarColorProvider;
- import org.chromium.chrome.browser.ui.tablet.emptybackground.EmptyBackgroundViewWrapper;
- import org.chromium.chrome.browser.vr.VrModuleProvider;
- @@ -903,21 +901,4 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
- return isShowingPromo; } */
- return false;
- }
- -
- - private boolean maybeShowPromo() {
- - // Only one promo can be shown in one run to avoid nagging users too much.
- - if (SigninPromoUtil.launchSigninPromoIfNeeded(mActivity,
- - SyncConsentActivityLauncherImpl.get(), VersionInfo.getProductMajorVersion())) {
- - return true;
- - }
- - if (DefaultBrowserPromoUtils.prepareLaunchPromoIfNeeded(
- - mActivity, mWindowAndroid, false /* ignoreMaxCount */)) {
- - return true;
- - }
- - if (AppLanguagePromoDialog.maybeShowPrompt(mActivity, mModalDialogManagerSupplier,
- - () -> ApplicationLifetime.terminate(true))) {
- - return true;
- - }
- - return LanguageAskPrompt.maybeShowLanguageAskPrompt(mActivity, mModalDialogManagerSupplier);
- - }
- }
- diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
- --- a/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
- +++ b/chrome/android/java/src/org/chromium/chrome/browser/tasks/ReturnToChromeUtil.java
- @@ -39,7 +39,6 @@ import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
- import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- import org.chromium.chrome.browser.segmentation_platform.SegmentationPlatformServiceFactory;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.tab.TabLaunchType;
- import org.chromium.chrome.browser.tabmodel.TabModel;
- @@ -52,7 +51,6 @@ import org.chromium.components.embedder_support.util.UrlConstants;
- import org.chromium.components.embedder_support.util.UrlUtilities;
- import org.chromium.components.optimization_guide.proto.ModelsProto.OptimizationTarget;
- import org.chromium.components.segmentation_platform.SegmentationPlatformService;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.components.user_prefs.UserPrefs;
- import org.chromium.content_public.browser.LoadUrlParams;
- import org.chromium.content_public.common.ResourceRequestBody;
- @@ -565,13 +563,8 @@ public final class ReturnToChromeUtil {
- * Caches the status of whether the primary account is synced.
- */
- public static void cachePrimaryAccountSyncStatus() {
- - boolean isPrimaryAccountSync =
- - IdentityServicesProvider.get()
- - .getSigninManager(Profile.getLastUsedRegularProfile())
- - .getIdentityManager()
- - .hasPrimaryAccount(ConsentLevel.SYNC);
- SharedPreferencesManager.getInstance().writeBoolean(
- - ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, isPrimaryAccountSync);
- + ChromePreferenceKeys.PRIMARY_ACCOUNT_SYNC, false);
- }
-
- /**
- diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
- --- a/chrome/browser/BUILD.gn
- +++ b/chrome/browser/BUILD.gn
- @@ -1611,58 +1611,6 @@ static_library("browser") {
- "sharing/web_push/web_push_sender.h",
- "shell_integration.cc",
- "shell_integration.h",
- - "signin/about_signin_internals_factory.cc",
- - "signin/about_signin_internals_factory.h",
- - "signin/account_consistency_mode_manager.cc",
- - "signin/account_consistency_mode_manager.h",
- - "signin/account_consistency_mode_manager_factory.cc",
- - "signin/account_consistency_mode_manager_factory.h",
- - "signin/account_id_from_account_info.cc",
- - "signin/account_id_from_account_info.h",
- - "signin/account_investigator_factory.cc",
- - "signin/account_investigator_factory.h",
- - "signin/account_reconcilor_factory.cc",
- - "signin/account_reconcilor_factory.h",
- - "signin/chrome_device_id_helper.cc",
- - "signin/chrome_device_id_helper.h",
- - "signin/chrome_signin_client.cc",
- - "signin/chrome_signin_client.h",
- - "signin/chrome_signin_client_factory.cc",
- - "signin/chrome_signin_client_factory.h",
- - "signin/chrome_signin_helper.cc",
- - "signin/chrome_signin_helper.h",
- - "signin/chrome_signin_proxying_url_loader_factory.cc",
- - "signin/chrome_signin_proxying_url_loader_factory.h",
- - "signin/chrome_signin_url_loader_throttle.cc",
- - "signin/chrome_signin_url_loader_throttle.h",
- - "signin/cookie_reminter_factory.cc",
- - "signin/cookie_reminter_factory.h",
- - "signin/header_modification_delegate.h",
- - "signin/header_modification_delegate_impl.cc",
- - "signin/header_modification_delegate_impl.h",
- - "signin/identity_manager_factory.cc",
- - "signin/identity_manager_factory.h",
- - "signin/investigator_dependency_provider.cc",
- - "signin/investigator_dependency_provider.h",
- - "signin/primary_account_policy_manager.cc",
- - "signin/primary_account_policy_manager.h",
- - "signin/primary_account_policy_manager_factory.cc",
- - "signin/primary_account_policy_manager_factory.h",
- - "signin/reauth_result.h",
- - "signin/reauth_tab_helper.cc",
- - "signin/reauth_tab_helper.h",
- - "signin/signin_error_controller_factory.cc",
- - "signin/signin_error_controller_factory.h",
- - "signin/signin_features.cc",
- - "signin/signin_features.h",
- - "signin/signin_profile_attributes_updater.cc",
- - "signin/signin_profile_attributes_updater.h",
- - "signin/signin_profile_attributes_updater_factory.cc",
- - "signin/signin_profile_attributes_updater_factory.h",
- - "signin/signin_promo_util.cc",
- - "signin/signin_promo_util.h",
- - "signin/signin_util.cc",
- - "signin/signin_util.h",
- "site_isolation/about_flags.h",
- "site_isolation/prefs_observer.cc",
- "site_isolation/prefs_observer.h",
- @@ -1734,40 +1682,6 @@ static_library("browser") {
- "subresource_filter/subresource_filter_history_observer.h",
- "subresource_filter/subresource_filter_profile_context_factory.cc",
- "subresource_filter/subresource_filter_profile_context_factory.h",
- - "sync/bookmark_sync_service_factory.cc",
- - "sync/bookmark_sync_service_factory.h",
- - "sync/chrome_sync_client.cc",
- - "sync/chrome_sync_client.h",
- - "sync/device_info_sync_client_impl.cc",
- - "sync/device_info_sync_client_impl.h",
- - "sync/device_info_sync_service_factory.cc",
- - "sync/device_info_sync_service_factory.h",
- - "sync/glue/extensions_activity_monitor.cc",
- - "sync/glue/extensions_activity_monitor.h",
- - "sync/glue/sync_start_util.cc",
- - "sync/glue/sync_start_util.h",
- - "sync/model_type_store_service_factory.cc",
- - "sync/model_type_store_service_factory.h",
- - "sync/send_tab_to_self_sync_service_factory.cc",
- - "sync/send_tab_to_self_sync_service_factory.h",
- - "sync/session_sync_service_factory.cc",
- - "sync/session_sync_service_factory.h",
- - "sync/sessions/sync_sessions_router_tab_helper.cc",
- - "sync/sessions/sync_sessions_router_tab_helper.h",
- - "sync/sessions/sync_sessions_web_contents_router.cc",
- - "sync/sessions/sync_sessions_web_contents_router.h",
- - "sync/sessions/sync_sessions_web_contents_router_factory.cc",
- - "sync/sessions/sync_sessions_web_contents_router_factory.h",
- - "sync/sync_encryption_keys_tab_helper.cc",
- - "sync/sync_encryption_keys_tab_helper.h",
- - "sync/sync_invalidations_service_factory.cc",
- - "sync/sync_invalidations_service_factory.h",
- - "sync/sync_service_factory.cc",
- - "sync/sync_service_factory.h",
- - "sync/sync_startup_tracker.cc",
- - "sync/sync_startup_tracker.h",
- - "sync/user_event_service_factory.cc",
- - "sync/user_event_service_factory.h",
- "tab_contents/navigation_metrics_recorder.cc",
- "tab_contents/navigation_metrics_recorder.h",
- "tab_contents/tab_util.cc",
- @@ -1993,7 +1907,6 @@ static_library("browser") {
- "//chrome/browser/share",
- "//chrome/browser/sharing:buildflags",
- "//chrome/browser/sharing/proto",
- - "//chrome/browser/signin:identity_manager_provider",
- "//chrome/browser/storage_access_api:permissions",
- "//chrome/browser/thumbnail",
- "//chrome/browser/touch_to_fill",
- @@ -2265,10 +2178,6 @@ static_library("browser") {
- "//components/services/unzip/public/mojom",
- "//components/sessions",
- "//components/shared_highlighting/core/common",
- - "//components/signin/core/browser",
- - "//components/signin/public/base:signin_buildflags",
- - "//components/signin/public/identity_manager",
- - "//components/signin/public/webdata",
- "//components/site_engagement/content",
- "//components/site_engagement/core/mojom:mojo_bindings",
- "//components/site_isolation",
- @@ -2923,16 +2832,6 @@ static_library("browser") {
- "android/service_tab_launcher.h",
- "android/shortcut_helper.cc",
- "android/shortcut_helper.h",
- - "android/signin/fre_mobile_identity_consistency_field_trial.cc",
- - "android/signin/fre_mobile_identity_consistency_field_trial.h",
- - "android/signin/signin_bridge.cc",
- - "android/signin/signin_bridge.h",
- - "android/signin/signin_manager_android.cc",
- - "android/signin/signin_manager_android.h",
- - "android/signin/signin_metrics_utils.cc",
- - "android/signin/unified_consent_service_bridge.cc",
- - "android/signin/web_signin_bridge.cc",
- - "android/signin/web_signin_bridge.h",
- "android/startup_bridge.cc",
- "android/startup_bridge.h",
- "android/survey/http_client_type.cc",
- @@ -3201,16 +3100,10 @@ static_library("browser") {
- "password_check/android/password_check_bridge.h",
- "password_check/android/password_check_manager.cc",
- "password_check/android/password_check_manager.h",
- - "password_manager/android/account_chooser_dialog_android.cc",
- - "password_manager/android/account_chooser_dialog_android.h",
- "password_manager/android/all_passwords_bottom_sheet_controller.cc",
- "password_manager/android/all_passwords_bottom_sheet_controller.h",
- "password_manager/android/all_passwords_bottom_sheet_helper.cc",
- "password_manager/android/all_passwords_bottom_sheet_helper.h",
- - "password_manager/android/auto_signin_first_run_dialog_android.cc",
- - "password_manager/android/auto_signin_first_run_dialog_android.h",
- - "password_manager/android/auto_signin_prompt_controller.cc",
- - "password_manager/android/auto_signin_prompt_controller.h",
- "password_manager/android/credential_android.cc",
- "password_manager/android/credential_android.h",
- "password_manager/android/credential_leak_controller_android.cc",
- @@ -3314,27 +3207,12 @@ static_library("browser") {
- "sharing/sms/sms_fetch_request_handler.cc",
- "sharing/sms/sms_fetch_request_handler.h",
- "shell_integration_android.cc",
- - "signin/identity_services_provider_android.cc",
- - "signin/signin_manager_android_factory.cc",
- - "signin/signin_manager_android_factory.h",
- "ssl/chrome_security_state_client.cc",
- "ssl/chrome_security_state_client.h",
- "ssl/chrome_security_state_model_delegate.cc",
- "ssl/chrome_security_state_model_delegate.h",
- "ssl/known_interception_disclosure_infobar.cc",
- "ssl/known_interception_disclosure_infobar.h",
- - "sync/android/sync_service_android_bridge.cc",
- - "sync/android/sync_service_android_bridge.h",
- - "sync/glue/synced_tab_delegate_android.cc",
- - "sync/glue/synced_tab_delegate_android.h",
- - "sync/glue/synced_window_delegate_android.cc",
- - "sync/glue/synced_window_delegate_android.h",
- - "sync/glue/synced_window_delegates_getter_android.cc",
- - "sync/glue/synced_window_delegates_getter_android.h",
- - "sync/sync_error_infobar_delegate_android.cc",
- - "sync/sync_error_infobar_delegate_android.h",
- - "sync/trusted_vault_client_android.cc",
- - "sync/trusted_vault_client_android.h",
- "tab/web_contents_state.cc",
- "tab/web_contents_state.h",
- "touch_to_fill/touch_to_fill_controller.cc",
- @@ -3411,8 +3289,6 @@ static_library("browser") {
- "//chrome/browser/safety_check/android",
- "//chrome/browser/share/android:jni_headers",
- "//chrome/browser/share/core/crow:crow_configuration",
- - "//chrome/browser/signin/services/android:jni_headers",
- - "//chrome/browser/sync/android:jni_headers",
- "//chrome/browser/tab:jni_headers",
- "//chrome/browser/ui/android/layouts:android",
- "//chrome/browser/ui/webui/explore_sites_internals:mojo_bindings",
- @@ -3493,8 +3369,6 @@ static_library("browser") {
- "//components/safe_browsing/core/browser/password_protection:password_protection_metrics_util",
- "//components/security_state/content/android",
- "//components/send_tab_to_self",
- - "//components/signin/internal/identity_manager", # cf android/signin/DEPS
- - "//components/signin/public/android:jni_headers",
- "//components/subresource_filter/android",
- "//components/thin_webview/internal",
- "//components/translate/content/android",
- @@ -4270,12 +4144,6 @@ static_library("browser") {
- "sharing_hub/sharing_hub_service.h",
- "sharing_hub/sharing_hub_service_factory.cc",
- "sharing_hub/sharing_hub_service_factory.h",
- - "signin/signin_promo.cc",
- - "signin/signin_promo.h",
- - "signin/signin_ui_delegate.cc",
- - "signin/signin_ui_delegate.h",
- - "signin/signin_ui_util.cc",
- - "signin/signin_ui_util.h",
- "speech/chrome_speech_recognition_service.cc",
- "speech/chrome_speech_recognition_service.h",
- "speech/extension_api/tts_extension_api_constants.cc", # Should be moved
- @@ -5098,8 +4966,6 @@ static_library("browser") {
- "profiles/gaia_info_update_service.h",
- "profiles/gaia_info_update_service_factory.cc",
- "profiles/gaia_info_update_service_factory.h",
- - "signin/chrome_signin_and_sync_status_metrics_provider.cc",
- - "signin/chrome_signin_and_sync_status_metrics_provider.h",
- ]
-
- if (!is_android && !is_chromeos_lacros) {
- @@ -5353,8 +5219,6 @@ static_library("browser") {
- "notifications/notification_platform_bridge_lacros.cc",
- "notifications/notification_platform_bridge_lacros.h",
- "platform_util_lacros.cc",
- - "signin/signin_ui_delegate_impl_lacros.cc",
- - "signin/signin_ui_delegate_impl_lacros.h",
- "speech/tts_client_factory_lacros.cc",
- "speech/tts_client_factory_lacros.h",
- "speech/tts_client_lacros.cc",
- @@ -6243,12 +6107,6 @@ static_library("browser") {
- "profiles/profile_statistics_common.h",
- "profiles/profile_statistics_factory.cc",
- "profiles/profile_statistics_factory.h",
- - "signin/force_signin_verifier.cc",
- - "signin/force_signin_verifier.h",
- - "signin/signin_manager.cc",
- - "signin/signin_manager.h",
- - "signin/signin_manager_factory.cc",
- - "signin/signin_manager_factory.h",
- "upgrade_detector/get_installed_version.cc",
- "upgrade_detector/get_installed_version.h",
- "upgrade_detector/installed_version_monitor.h",
- @@ -7783,10 +7641,6 @@ static_library("test_support") {
- "resource_coordinator/tab_load_tracker_test_support.h",
- "share/fake_share_history.cc",
- "share/fake_share_history.h",
- - "signin/chrome_signin_client_test_util.cc",
- - "signin/chrome_signin_client_test_util.h",
- - "signin/e2e_tests/test_accounts_util.cc",
- - "signin/e2e_tests/test_accounts_util.h",
- "ssl/ssl_browsertest_util.cc",
- "ssl/ssl_browsertest_util.h",
- "ssl/ssl_client_auth_requestor_mock.cc",
- @@ -7832,7 +7686,6 @@ static_library("test_support") {
- "//components/security_interstitials/content:security_interstitial_page",
- "//components/services/unzip/content",
- "//components/sessions:test_support",
- - "//components/signin/public/identity_manager:test_support",
- "//components/subresource_filter/core/browser:test_support",
- "//components/subresource_filter/core/common:test_support",
- "//components/sync_preferences:test_support",
- @@ -8074,8 +7927,6 @@ if (!is_android) {
- visibility = [ "//chrome/test:test_support_ui" ]
-
- sources = [
- - "signin/token_revoker_test_utils.cc",
- - "signin/token_revoker_test_utils.h",
- "ui/webui/test_data_source.cc",
- "ui/webui/test_data_source.h",
- "ui/webui/web_ui_test_handler.cc",
- @@ -8091,7 +7942,6 @@ if (!is_android) {
- "//chrome/test/data:web_ui_test_bindings",
- "//components/metrics:test_support",
- "//components/password_manager/core/browser:test_support",
- - "//components/signin/public/identity_manager",
- "//components/sync/driver:test_support",
- "//components/translate/content/common",
- "//content/test:test_support",
- diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
- --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
- +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
- @@ -34,8 +34,6 @@
- #include "chrome/browser/profiles/profile_key.h"
- #include "chrome/browser/query_tiles/tile_service_factory.h"
- #include "chrome/browser/search_engines/template_url_service_factory.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- -#include "chrome/browser/sync/sync_service_factory.h"
- #include "chrome/browser/translate/chrome_translate_client.h"
- #include "chrome/browser/ui/browser_command_controller.h"
- #include "chrome/browser/ui/browser_finder.h"
- @@ -55,9 +53,6 @@
- #include "components/omnibox/browser/tab_matcher.h"
- #include "components/omnibox/common/omnibox_features.h"
- #include "components/prefs/pref_service.h"
- -#include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- -#include "components/sync/driver/sync_service.h"
- #include "components/translate/core/browser/translate_manager.h"
- #include "components/unified_consent/url_keyed_data_collection_consent_helper.h"
- #include "content/public/browser/navigation_entry.h"
- @@ -109,8 +104,7 @@ ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient(
- : profile_(profile),
- scheme_classifier_(profile),
- url_consent_helper_(unified_consent::UrlKeyedDataCollectionConsentHelper::
- - NewPersonalizedDataCollectionConsentHelper(
- - SyncServiceFactory::GetForProfile(profile_))),
- + NewPersonalizedDataCollectionConsentHelper(nullptr)),
- tab_matcher_(*this, profile_),
- storage_partition_(nullptr),
- omnibox_triggered_feature_service_(
- @@ -300,11 +294,6 @@ ChromeAutocompleteProviderClient::GetOmniboxTriggeredFeatureService() const {
- return omnibox_triggered_feature_service_.get();
- }
-
- -signin::IdentityManager* ChromeAutocompleteProviderClient::GetIdentityManager()
- - const {
- - return IdentityManagerFactory::GetForProfile(profile_);
- -}
- -
- bool ChromeAutocompleteProviderClient::IsAlwaysIncognitoEnabled() const {
- if (profile_->GetPrefs()->GetBoolean(prefs::kAlwaysIncognitoEnabled)) {
- return true;
- @@ -330,15 +319,11 @@ bool ChromeAutocompleteProviderClient::IsPersonalizedUrlDataCollectionActive()
- }
-
- bool ChromeAutocompleteProviderClient::IsAuthenticated() const {
- - const auto* identity_manager =
- - IdentityManagerFactory::GetForProfile(profile_);
- - return identity_manager &&
- - !identity_manager->GetAccountsInCookieJar().signed_in_accounts.empty();
- + return false;
- }
-
- bool ChromeAutocompleteProviderClient::IsSyncActive() const {
- - syncer::SyncService* sync = SyncServiceFactory::GetForProfile(profile_);
- - return sync && sync->IsSyncFeatureActive();
- + return false;
- }
-
- std::string ChromeAutocompleteProviderClient::ProfileUserName() const {
- diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
- --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
- +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h
- @@ -76,7 +76,6 @@ class ChromeAutocompleteProviderClient : public AutocompleteProviderClient {
- query_tiles::TileService* GetQueryTileService() const override;
- OmniboxTriggeredFeatureService* GetOmniboxTriggeredFeatureService()
- const override;
- - signin::IdentityManager* GetIdentityManager() const override;
- bool IsOffTheRecord() const override;
- bool IsAlwaysIncognitoEnabled() const override;
- bool SearchSuggestEnabled() const override;
- diff --git a/chrome/browser/autocomplete/document_suggestions_service_factory.cc b/chrome/browser/autocomplete/document_suggestions_service_factory.cc
- --- a/chrome/browser/autocomplete/document_suggestions_service_factory.cc
- +++ b/chrome/browser/autocomplete/document_suggestions_service_factory.cc
- @@ -6,7 +6,6 @@
-
- #include "base/memory/singleton.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/omnibox/browser/document_suggestions_service.h"
- #include "content/public/browser/storage_partition.h"
- @@ -29,10 +28,8 @@ KeyedService* DocumentSuggestionsServiceFactory::BuildServiceInstanceFor(
- content::BrowserContext* context) const {
- Profile* profile = Profile::FromBrowserContext(context);
-
- - signin::IdentityManager* identity_manager =
- - IdentityManagerFactory::GetForProfile(profile);
- return new DocumentSuggestionsService(
- - identity_manager, profile->GetDefaultStoragePartition()
- + /* identity_manager */ nullptr, profile->GetDefaultStoragePartition()
- ->GetURLLoaderFactoryForBrowserProcess());
- }
-
- @@ -40,7 +37,6 @@ DocumentSuggestionsServiceFactory::DocumentSuggestionsServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "DocumentSuggestionsService",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(IdentityManagerFactory::GetInstance());
- }
-
- DocumentSuggestionsServiceFactory::~DocumentSuggestionsServiceFactory() {}
- diff --git a/chrome/browser/autofill/personal_data_manager_factory.cc b/chrome/browser/autofill/personal_data_manager_factory.cc
- --- a/chrome/browser/autofill/personal_data_manager_factory.cc
- +++ b/chrome/browser/autofill/personal_data_manager_factory.cc
- @@ -11,7 +11,6 @@
- #include "chrome/browser/history/history_service_factory.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "chrome/browser/web_data_service_factory.h"
- #include "components/autofill/core/browser/personal_data_manager.h"
- #include "components/autofill/core/browser/strike_database.h"
- @@ -60,7 +59,6 @@ PersonalDataManagerFactory::PersonalDataManagerFactory()
- : BrowserContextKeyedServiceFactory(
- "PersonalDataManager",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(IdentityManagerFactory::GetInstance());
- DependsOn(HistoryServiceFactory::GetInstance());
- DependsOn(WebDataServiceFactory::GetInstance());
- DependsOn(StrikeDatabaseFactory::GetInstance());
- @@ -86,7 +84,7 @@ KeyedService* PersonalDataManagerFactory::BuildPersonalDataManager(
-
- service->Init(local_storage, account_storage, profile->GetPrefs(),
- g_browser_process->local_state(),
- - IdentityManagerFactory::GetForProfile(profile), history_service,
- + nullptr, history_service,
- strike_database, image_fetcher, profile->IsOffTheRecord());
-
- if (!syncer::IsSyncAllowedByFlag())
- diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
- --- a/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
- +++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.cc
- @@ -58,14 +58,7 @@ PasswordManagerClient* CommonDependenciesChrome::GetPasswordManagerClient(
-
- std::string CommonDependenciesChrome::GetSignedInEmail(
- WebContents* web_contents) const {
- - signin::IdentityManager* identity_manager =
- - IdentityManagerFactory::GetForProfile(
- - Profile::FromBrowserContext(web_contents->GetBrowserContext()));
- - if (!identity_manager) {
- return std::string();
- - }
- - return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
- - .email;
- }
-
- AnnotateDomModelService*
- @@ -78,12 +71,6 @@ bool CommonDependenciesChrome::IsWebLayer() const {
- return false;
- }
-
- -signin::IdentityManager* CommonDependenciesChrome::GetIdentityManager(
- - content::BrowserContext* browser_context) const {
- - return IdentityManagerFactory::GetForProfile(
- - Profile::FromBrowserContext(browser_context));
- -}
- -
- version_info::Channel CommonDependenciesChrome::GetChannel() const {
- return chrome::GetChannel();
- }
- diff --git a/chrome/browser/autofill_assistant/common_dependencies_chrome.h b/chrome/browser/autofill_assistant/common_dependencies_chrome.h
- --- a/chrome/browser/autofill_assistant/common_dependencies_chrome.h
- +++ b/chrome/browser/autofill_assistant/common_dependencies_chrome.h
- @@ -44,9 +44,6 @@ class CommonDependenciesChrome : public CommonDependencies {
-
- bool IsWebLayer() const override;
-
- - signin::IdentityManager* GetIdentityManager(
- - content::BrowserContext* browser_context) const override;
- -
- version_info::Channel GetChannel() const override;
- };
-
- diff --git a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
- --- a/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
- +++ b/chrome/browser/browsing_data/chrome_browsing_data_lifetime_manager.cc
- @@ -307,8 +307,7 @@ void ChromeBrowsingDataLifetimeManager::ClearBrowsingDataForOnExitPolicy(
- bool keep_browser_alive) {
- auto* data_types = profile_->GetPrefs()->GetList(
- browsing_data::prefs::kClearBrowsingDataOnExitList);
- - if (data_types && !data_types->GetListDeprecated().empty() &&
- - !SyncServiceFactory::IsSyncAllowed(profile_)) {
- + if (data_types && !data_types->GetListDeprecated().empty()) {
- profile_->GetPrefs()->SetBoolean(
- browsing_data::prefs::kClearBrowsingDataOnExitDeletionPending, true);
- auto* remover = profile_->GetBrowsingDataRemover();
- @@ -347,9 +346,6 @@ void ChromeBrowsingDataLifetimeManager::StartScheduledBrowsingDataRemoval() {
- if (removal_settings.time_to_live_in_hours <= 0)
- continue;
-
- - if (SyncServiceFactory::IsSyncAllowed(profile_))
- - continue;
- -
- auto deletion_end_time = end_time_for_testing_.value_or(
- base::Time::Now() -
- base::Hours(removal_settings.time_to_live_in_hours));
- diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
- --- a/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
- +++ b/chrome/browser/browsing_data/counters/browsing_data_counter_utils.cc
- @@ -13,12 +13,10 @@
- #include "chrome/browser/browsing_data/counters/signin_data_counter.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/signin/account_consistency_mode_manager.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "chrome/common/pref_names.h"
- #include "chrome/grit/generated_resources.h"
- #include "components/browsing_data/core/pref_names.h"
- #include "components/prefs/pref_service.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/strings/grit/components_strings.h"
- #include "ui/base/l10n/l10n_util.h"
- #include "ui/base/text/bytes_formatting.h"
- @@ -53,10 +51,6 @@ std::u16string FormatBytesMBOrHigher(ResultInt bytes) {
- } // namespace
-
- bool ShouldShowCookieException(Profile* profile) {
- - if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile)) {
- - auto* identity_manager = IdentityManagerFactory::GetForProfile(profile);
- - return identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync);
- - }
- #if BUILDFLAG(ENABLE_DICE_SUPPORT)
- if (AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)) {
- return GetSyncStatusMessageType(profile) == SyncStatusMessageType::kSynced;
- diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
- --- a/chrome/browser/chrome_browser_field_trials.cc
- +++ b/chrome/browser/chrome_browser_field_trials.cc
- @@ -101,8 +101,8 @@ void ChromeBrowserFieldTrials::SetUpFeatureControllingFieldTrials(
- }
- }
-
- -void ChromeBrowserFieldTrials::RegisterSyntheticTrials() {
- -#if BUILDFLAG(IS_ANDROID)
- +void ChromeBrowserFieldTrials::RegisterSyntheticTrials() { // disabled in Bromite
- +#if 0
- static constexpr char kReachedCodeProfilerTrial[] =
- "ReachedCodeProfilerSynthetic2";
- std::string reached_code_profiler_group =
- @@ -176,7 +176,7 @@ void ChromeBrowserFieldTrials::RegisterSyntheticTrials() {
- kFREMobileIdentityConsistencyVariationsTrial, variation_group);
- }
- }
- -#endif // BUILDFLAG(IS_ANDROID)
- +#endif // disabled in Bromite
- }
-
- void ChromeBrowserFieldTrials::InstantiateDynamicTrials() {
- diff --git a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
- --- a/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
- +++ b/chrome/browser/endpoint_fetcher/endpoint_fetcher.cc
- @@ -57,7 +57,7 @@ EndpointFetcher::EndpointFetcher(
- annotation_tag,
- profile->GetDefaultStoragePartition()
- ->GetURLLoaderFactoryForBrowserProcess(),
- - IdentityManagerFactory::GetForProfile(profile)) {}
- + nullptr) {}
-
- EndpointFetcher::EndpointFetcher(
- Profile* const profile,
- diff --git a/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
- --- a/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
- +++ b/chrome/browser/enterprise/reporting/profile_report_generator_delegate_base.cc
- @@ -13,13 +13,10 @@
- #include "chrome/browser/policy/chrome_browser_policy_connector.h"
- #include "chrome/browser/policy/chrome_policy_conversions_client.h"
- #include "chrome/browser/profiles/profile_manager.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "components/enterprise/browser/reporting/profile_report_generator.h"
- #include "components/policy/core/browser/policy_conversions.h"
- #include "components/policy/core/browser/policy_conversions_client.h"
- #include "components/policy/proto/device_management_backend.pb.h"
- -#include "components/signin/public/identity_manager/account_info.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
-
- namespace enterprise_reporting {
-
- @@ -37,14 +34,6 @@ bool ProfileReportGeneratorDelegateBase::Init(const base::FilePath& path) {
-
- void ProfileReportGeneratorDelegateBase::GetSigninUserInfo(
- enterprise_management::ChromeUserProfileInfo* report) {
- - auto account_info =
- - IdentityManagerFactory::GetForProfile(profile_)->GetPrimaryAccountInfo(
- - signin::ConsentLevel::kSync);
- - if (account_info.IsEmpty())
- - return;
- - auto* signed_in_user_info = report->mutable_chrome_signed_in_user();
- - signed_in_user_info->set_email(account_info.email);
- - signed_in_user_info->set_obfuscated_gaia_id(account_info.gaia);
- }
-
- std::unique_ptr<policy::PolicyConversionsClient>
- diff --git a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
- --- a/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
- +++ b/chrome/browser/favicon/history_ui_favicon_request_handler_factory.cc
- @@ -46,7 +46,6 @@ HistoryUiFaviconRequestHandlerFactory::HistoryUiFaviconRequestHandlerFactory()
- BrowserContextDependencyManager::GetInstance()) {
- DependsOn(FaviconServiceFactory::GetInstance());
- DependsOn(LargeIconServiceFactory::GetInstance());
- - DependsOn(SyncServiceFactory::GetInstance());
- }
-
- HistoryUiFaviconRequestHandlerFactory::
- diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn
- --- a/chrome/browser/feed/android/BUILD.gn
- +++ b/chrome/browser/feed/android/BUILD.gn
- @@ -97,7 +97,6 @@ android_library("java") {
- "//chrome/browser/privacy:java",
- "//chrome/browser/profiles/android:java",
- "//chrome/browser/share:java",
- - "//chrome/browser/signin/services/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/ui/android/appmenu:java",
- "//chrome/browser/ui/android/native_page:java",
- diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
- --- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
- +++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
- @@ -11,9 +11,7 @@ import org.chromium.chrome.browser.feed.componentinterfaces.SurfaceCoordinator.S
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.preferences.Pref;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.components.prefs.PrefService;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- import org.chromium.components.user_prefs.UserPrefs;
-
- /**
- diff --git a/chrome/browser/feed/feed_service_factory.cc b/chrome/browser/feed/feed_service_factory.cc
- --- a/chrome/browser/feed/feed_service_factory.cc
- +++ b/chrome/browser/feed/feed_service_factory.cc
- @@ -17,7 +17,6 @@
- #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profile_key.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "chrome/common/channel_info.h"
- #include "chrome/common/chrome_version.h"
- #include "components/background_task_scheduler/background_task_scheduler_factory.h"
- @@ -160,7 +159,6 @@ FeedServiceFactory::FeedServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "FeedService",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(IdentityManagerFactory::GetInstance());
- DependsOn(HistoryServiceFactory::GetInstance());
- DependsOn(background_task::BackgroundTaskSchedulerFactory::GetInstance());
- }
- @@ -181,8 +179,6 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor(
- content::StoragePartition* storage_partition =
- context->GetDefaultStoragePartition();
-
- - signin::IdentityManager* identity_manager =
- - IdentityManagerFactory::GetForProfile(profile);
- std::string api_key;
- if (google_apis::IsGoogleChromeAPIKeyUsed()) {
- bool is_stable_channel =
- @@ -223,7 +219,7 @@ KeyedService* FeedServiceFactory::BuildServiceInstanceFor(
- storage_partition->GetProtoDatabaseProvider()->GetDB<feedkvstore::Entry>(
- leveldb_proto::ProtoDbType::FEED_KEY_VALUE_DATABASE,
- feed_dir.AppendASCII("keyvaldb"), background_task_runner),
- - identity_manager,
- + /* identity_manager */ nullptr,
- HistoryServiceFactory::GetForProfile(profile,
- ServiceAccessType::IMPLICIT_ACCESS),
- storage_partition->GetURLLoaderFactoryForBrowserProcess(),
- diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
- --- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
- +++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/MobileFreProgress.java
- @@ -17,7 +17,7 @@ import java.lang.annotation.RetentionPolicy;
- @IntDef({
- MobileFreProgress.STARTED,
- MobileFreProgress.WELCOME_SHOWN,
- - MobileFreProgress.DEPRECATED_DATA_SAVER_SHOWN,
- + MobileFreProgress.DEPRECATED_DATA_SAVER_SHOWN_DISABLED,
- MobileFreProgress.SYNC_CONSENT_SHOWN,
- MobileFreProgress.SYNC_CONSENT_ACCEPTED,
- MobileFreProgress.SYNC_CONSENT_DISMISSED,
- @@ -33,7 +33,7 @@ import java.lang.annotation.RetentionPolicy;
- public @interface MobileFreProgress {
- int STARTED = 0;
- int WELCOME_SHOWN = 1;
- - int DEPRECATED_DATA_SAVER_SHOWN = 2;
- + int DEPRECATED_DATA_SAVER_SHOWN_DISABLED = 2;
- int SYNC_CONSENT_SHOWN = 3;
- /** The user clicked on the continue button to continue with sync consent. */
- int SYNC_CONSENT_ACCEPTED = 4;
- diff --git a/chrome/browser/gcm/gcm_profile_service_factory.cc b/chrome/browser/gcm/gcm_profile_service_factory.cc
- --- a/chrome/browser/gcm/gcm_profile_service_factory.cc
- +++ b/chrome/browser/gcm/gcm_profile_service_factory.cc
- @@ -13,7 +13,6 @@
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/profiles/profile_key.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "components/gcm_driver/gcm_profile_service.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/offline_pages/buildflags/buildflags.h"
- @@ -113,7 +112,6 @@ GCMProfileServiceFactory::GCMProfileServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "GCMProfileService",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(IdentityManagerFactory::GetInstance());
- #if BUILDFLAG(ENABLE_OFFLINE_PAGES)
- DependsOn(offline_pages::PrefetchServiceFactory::GetInstance());
- #endif // BUILDFLAG(ENABLE_OFFLINE_PAGES)
- @@ -147,7 +145,7 @@ KeyedService* GCMProfileServiceFactory::BuildServiceInstanceFor(
- ->GetURLLoaderFactoryForBrowserProcess(),
- content::GetNetworkConnectionTracker(), chrome::GetChannel(),
- gcm::GetProductCategoryForSubtypes(profile->GetPrefs()),
- - IdentityManagerFactory::GetForProfile(profile),
- + /* identity_manager = */ nullptr,
- std::make_unique<GCMClientFactory>(), content::GetUIThreadTaskRunner({}),
- content::GetIOThreadTaskRunner({}), blocking_task_runner);
- #endif
- diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
- --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
- +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
- @@ -15,7 +15,6 @@
- #include "chrome/browser/gcm/gcm_profile_service_factory.h"
- #include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- #include "chrome/common/chrome_content_client.h"
- #include "components/gcm_driver/gcm_profile_service.h"
- #include "components/gcm_driver/instance_id/instance_id_profile_service.h"
- @@ -42,36 +41,11 @@
- #endif
-
- namespace invalidation {
- -namespace {
- -
- -std::unique_ptr<InvalidationService> CreateInvalidationServiceForSenderId(
- - Profile* profile,
- - IdentityProvider* identity_provider,
- - const std::string& sender_id) {
- - auto service = std::make_unique<FCMInvalidationService>(
- - identity_provider,
- - base::BindRepeating(
- - &FCMNetworkHandler::Create,
- - gcm::GCMProfileServiceFactory::GetForProfile(profile)->driver(),
- - instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
- - ->driver()),
- - base::BindRepeating(
- - &PerUserTopicSubscriptionManager::Create, identity_provider,
- - profile->GetPrefs(),
- - base::RetainedRef(profile->GetDefaultStoragePartition()
- - ->GetURLLoaderFactoryForBrowserProcess())),
- - instance_id::InstanceIDProfileServiceFactory::GetForProfile(profile)
- - ->driver(),
- - profile->GetPrefs(), sender_id);
- - service->Init();
- - return service;
- -}
- -
- -} // namespace
-
- // static
- ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
- Profile* profile) {
- + return NULL;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
- // Using ProfileHelper::GetSigninProfile() here would lead to an infinite loop
- // when this method is called during the creation of the sign-in profile
- @@ -85,8 +59,6 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
- return NULL;
- }
- #endif
- - return static_cast<ProfileInvalidationProvider*>(
- - GetInstance()->GetServiceForBrowserContext(profile, true));
- }
-
- // static
- @@ -99,7 +71,6 @@ ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
- : BrowserContextKeyedServiceFactory(
- "InvalidationService",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(IdentityManagerFactory::GetInstance());
- DependsOn(gcm::GCMProfileServiceFactory::GetInstance());
- }
-
- @@ -116,8 +87,6 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
- if (testing_factory_)
- return testing_factory_.Run(context).release();
-
- - std::unique_ptr<IdentityProvider> identity_provider;
- -
- #if BUILDFLAG(IS_CHROMEOS_ASH)
- policy::BrowserPolicyConnectorAsh* connector =
- g_browser_process->platform_part()->browser_policy_connector_ash();
- @@ -129,20 +98,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
- }
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- - Profile* profile = Profile::FromBrowserContext(context);
- -
- - if (!identity_provider) {
- - identity_provider = std::make_unique<ProfileIdentityProvider>(
- - IdentityManagerFactory::GetForProfile(profile));
- - }
- - auto service =
- - CreateInvalidationServiceForSenderId(profile, identity_provider.get(),
- - /* sender_id = */ "");
- - auto custom_sender_id_factory = base::BindRepeating(
- - &CreateInvalidationServiceForSenderId, profile, identity_provider.get());
- - return new ProfileInvalidationProvider(std::move(service),
- - std::move(identity_provider),
- - std::move(custom_sender_id_factory));
- + return NULL;
- }
-
- void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
- diff --git a/chrome/browser/media/router/discovery/access_code/BUILD.gn b/chrome/browser/media/router/discovery/access_code/BUILD.gn
- --- a/chrome/browser/media/router/discovery/access_code/BUILD.gn
- +++ b/chrome/browser/media/router/discovery/access_code/BUILD.gn
- @@ -55,7 +55,6 @@ if (!is_android) {
- "//chrome/browser/media/router/discovery:discovery",
- "//chrome/browser/media/router/discovery/access_code:discovery_resources_proto",
- "//chrome/browser/profiles:profile",
- - "//chrome/browser/signin:identity_manager_provider",
- "//chrome/browser/ui/webui/access_code_cast:mojo_bindings",
- "//components/cast_channel:cast_channel",
- "//components/keyed_service/content:content",
- diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
- --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
- +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
- @@ -49,7 +49,6 @@
- #include "chrome/browser/metrics/desktop_platform_features_metrics_provider.h"
- #include "chrome/browser/metrics/desktop_session_duration/desktop_profile_session_durations_service_factory.h"
- #include "chrome/browser/metrics/desktop_session_duration/desktop_session_metrics_provider.h"
- -#include "chrome/browser/metrics/family_link_user_metrics_provider.h"
- #include "chrome/browser/metrics/https_engagement_metrics_provider.h"
- #include "chrome/browser/metrics/metrics_reporting_state.h"
- #include "chrome/browser/metrics/network_quality_estimator_provider_impl.h"
- @@ -178,7 +177,6 @@
- #endif
-
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
- -#include "chrome/browser/signin/chrome_signin_and_sync_status_metrics_provider.h"
- #include "components/metrics/content/accessibility_metrics_provider.h"
- #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
-
- @@ -771,8 +769,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
- std::make_unique<ChromeAndroidMetricsProvider>(local_state));
- metrics_service_->RegisterMetricsProvider(
- std::make_unique<PageLoadMetricsProvider>());
- - metrics_service_->RegisterMetricsProvider(
- - std::make_unique<FamilyLinkUserMetricsProvider>());
- #else
- metrics_service_->RegisterMetricsProvider(
- std::make_unique<performance_manager::MetricsProvider>(local_state));
- @@ -845,8 +841,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
- - metrics_service_->RegisterMetricsProvider(
- - std::make_unique<ChromeSigninAndSyncStatusMetricsProvider>());
- // ChromeOS uses ChromeOSMetricsProvider for accessibility metrics provider.
- metrics_service_->RegisterMetricsProvider(
- std::make_unique<metrics::AccessibilityMetricsProvider>());
- diff --git a/chrome/browser/password_manager/android/BUILD.gn b/chrome/browser/password_manager/android/BUILD.gn
- --- a/chrome/browser/password_manager/android/BUILD.gn
- +++ b/chrome/browser/password_manager/android/BUILD.gn
- @@ -90,15 +90,12 @@ android_library("java") {
- "//chrome/browser/loading_modal/android:java",
- "//chrome/browser/profiles/android:java",
- "//chrome/browser/settings:java",
- - "//chrome/browser/signin/services/android:java",
- - "//chrome/browser/sync/android:java",
- "//components/browser_ui/settings/android:java",
- "//components/browser_ui/widget/android:java_resources",
- "//components/device_reauth:device_reauth_java_enums",
- "//components/password_manager/core/browser:password_manager_java_enums",
- "//components/password_manager/core/common:password_manager_common_java_enums",
- "//components/signin/public/android:java",
- - "//components/sync/android:sync_java",
- "//components/sync/protocol:protocol_java",
- "//content/public/android:content_java",
- "//third_party/android_deps:guava_android_java",
- @@ -182,14 +179,11 @@ junit_binary("password_manager_junit_tests") {
- "//chrome/browser/flags:java",
- "//chrome/browser/loading_modal/android:java",
- "//chrome/browser/profiles/android:java",
- - "//chrome/browser/signin/services/android:java",
- - "//chrome/browser/sync/android:java",
- "//chrome/test/android:chrome_java_test_support",
- "//components/browser_ui/settings/android:java",
- "//components/password_manager/core/browser:password_manager_java_enums",
- "//components/password_manager/core/common:password_manager_common_java_enums",
- "//components/signin/public/android:java",
- - "//components/sync/android:sync_java",
- "//components/sync/protocol:protocol_java",
- "//third_party/android_deps:guava_android_java",
- "//third_party/android_deps:protobuf_lite_runtime_java",
- diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
- --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
- +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
- @@ -26,11 +26,9 @@ import org.chromium.base.supplier.ObservableSupplier;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.loading_modal.LoadingModalDialogCoordinator;
- import org.chromium.chrome.browser.password_manager.CredentialManagerLauncher.CredentialManagerError;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.components.browser_ui.settings.SettingsLauncher;
- import org.chromium.components.signin.base.CoreAccountInfo;
- import org.chromium.components.signin.base.GoogleServiceAuthError;
- -import org.chromium.components.sync.ModelType;
- import org.chromium.ui.modaldialog.ModalDialogManager;
-
- import java.lang.annotation.Retention;
- @@ -131,20 +129,10 @@ public class PasswordManagerHelper {
- */
- public static void showPasswordSettings(Context context, @ManagePasswordsReferrer int referrer,
- SettingsLauncher settingsLauncher, CredentialManagerLauncher credentialManagerLauncher,
- - SyncService syncService,
- ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
- RecordHistogram.recordEnumeratedHistogram("PasswordManager.ManagePasswordsReferrer",
- referrer, ManagePasswordsReferrer.MAX_VALUE + 1);
-
- - if (credentialManagerLauncher != null && hasChosenToSyncPasswords(syncService)
- - && !hasPersistentAuthError(syncService)) {
- - LoadingModalDialogCoordinator loadingDialogCoordinator =
- - LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context);
- - launchTheCredentialManager(
- - referrer, credentialManagerLauncher, syncService, loadingDialogCoordinator);
- - return;
- - }
- -
- Bundle fragmentArgs = new Bundle();
- fragmentArgs.putInt(MANAGE_PASSWORDS_REFERRER, referrer);
- context.startActivity(settingsLauncher.createSettingsActivityIntent(
- @@ -155,19 +143,15 @@ public class PasswordManagerHelper {
- // to check whether UPM can be used (for password check as well as for all other cases that
- // share the same preconditions, e.g. launching the credential manager).
- public static boolean canUseUpmCheckup() {
- - SyncService syncService = SyncService.get();
- - return PasswordManagerHelper.usesUnifiedPasswordManagerUI() && syncService != null
- - && hasChosenToSyncPasswords(syncService) && !hasPersistentAuthError(syncService);
- + return false;
- }
-
- public static void showPasswordCheckup(Context context, @PasswordCheckReferrer int referrer,
- - PasswordCheckupClientHelper checkupClient, SyncService syncService,
- + PasswordCheckupClientHelper checkupClient,
- ObservableSupplier<ModalDialogManager> modalDialogManagerSupplier) {
- if (!usesUnifiedPasswordManagerUI()) return;
-
- - Optional<String> account = hasChosenToSyncPasswords(syncService)
- - ? Optional.of(CoreAccountInfo.getEmailFrom(syncService.getAccountInfo()))
- - : Optional.absent();
- + Optional<String> account = Optional.absent();
-
- LoadingModalDialogCoordinator loadingDialogCoordinator =
- LoadingModalDialogCoordinator.create(modalDialogManagerSupplier, context);
- @@ -223,49 +207,6 @@ public class PasswordManagerHelper {
- });
- }
-
- - /**
- - * Checks whether the sync feature is enabled and the user has chosen to sync passwords.
- - * Note that this doesn't mean that passwords are actively syncing.
- - *
- - * @param syncService the service to query about the sync status.
- - * @return true if syncing passwords is enabled
- - */
- - public static boolean hasChosenToSyncPasswords(SyncService syncService) {
- - return syncService != null && syncService.isSyncFeatureEnabled()
- - && syncService.getChosenDataTypes().contains(ModelType.PASSWORDS);
- - }
- -
- - /**
- - * Checks whether the sync feature is enabled, the user has chosen to sync passwords and
- - * they haven't set up a custom passphrase.
- - * The caller should make sure that the sync engine is initialized before calling this method.
- - *
- - * Note that this doesn't mean that passwords are actively syncing.
- - *
- - * @param syncService the service to query about the sync status.
- - * @return true if syncing passwords is enabled without custom passphrase.
- - */
- - public static boolean hasChosenToSyncPasswordsWithNoCustomPassphrase(SyncService syncService) {
- - assert syncService.isEngineInitialized();
- - return PasswordManagerHelper.hasChosenToSyncPasswords(syncService)
- - && !syncService.isUsingExplicitPassphrase();
- - }
- -
- - /**
- - * Checks whether the user is actively syncing passwords without a custom passphrase.
- - * The caller should make sure that the sync engine is initialized before calling this method.
- - *
- - * @param syncService the service to query about the sync status.
- - * @return true if actively syncing passwords and no custom passphrase was set.
- - */
- - public static boolean isSyncingPasswordsWithNoCustomPassphrase(SyncService syncService) {
- - assert syncService.isEngineInitialized();
- - if (syncService == null || !syncService.hasSyncConsent()) return false;
- - if (!syncService.getActiveDataTypes().contains(ModelType.PASSWORDS)) return false;
- - if (syncService.isUsingExplicitPassphrase()) return false;
- - return true;
- - }
- -
- public static boolean usesUnifiedPasswordManagerUI() {
- if (!ChromeFeatureList.isEnabled(UNIFIED_PASSWORD_MANAGER_ANDROID)) return false;
- @UpmExperimentVariation
- @@ -286,15 +227,15 @@ public class PasswordManagerHelper {
-
- @VisibleForTesting
- static void launchTheCredentialManager(@ManagePasswordsReferrer int referrer,
- - CredentialManagerLauncher credentialManagerLauncher, SyncService syncService,
- + CredentialManagerLauncher credentialManagerLauncher,
- LoadingModalDialogCoordinator loadingDialogCoordinator) {
- - if (!hasChosenToSyncPasswords(syncService)) return;
- + if ((true)) return;
-
- loadingDialogCoordinator.show();
-
- long startTimeMs = SystemClock.elapsedRealtime();
- credentialManagerLauncher.getCredentialManagerIntentForAccount(referrer,
- - CoreAccountInfo.getEmailFrom(syncService.getAccountInfo()),
- + "nobody@example.com",
- (intent)
- -> PasswordManagerHelper.launchCredentialManagerIntent(
- intent, startTimeMs, true, loadingDialogCoordinator),
- @@ -331,29 +272,6 @@ public class PasswordManagerHelper {
- });
- }
-
- - private static boolean hasPersistentAuthError(@NonNull SyncService syncService) {
- - // TODO(crbug.com/1327311): Ensure that the enum is generated from C++ and maybe
- - // that the transient check is properly mirrored in java to avoid manual code duplication
- - // which is error-prone.
- - switch (syncService.getAuthError()) {
- - // These are failures that are likely to succeed if tried again (or there is no
- - // failure.
- - case GoogleServiceAuthError.State.NONE:
- - case GoogleServiceAuthError.State.CONNECTION_FAILED:
- - case GoogleServiceAuthError.State.SERVICE_UNAVAILABLE:
- - case GoogleServiceAuthError.State.REQUEST_CANCELED:
- - return false;
- - case GoogleServiceAuthError.State.INVALID_GAIA_CREDENTIALS:
- - case GoogleServiceAuthError.State.USER_NOT_SIGNED_UP:
- - case GoogleServiceAuthError.State.UNEXPECTED_SERVICE_RESPONSE:
- - case GoogleServiceAuthError.State.SERVICE_ERROR:
- - return true;
- - default:
- - assert false : "All error values should be classified as persistent or transient";
- - return true;
- - }
- - }
- -
- private static void recordFailureMetrics(
- @CredentialManagerError int error, boolean forAccount) {
- // While support for the local storage API exists in Chrome, it isn't used at this time.
- diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
- --- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
- +++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordSyncControllerDelegateBridgeImpl.java
- @@ -8,7 +8,6 @@ import com.google.android.gms.common.api.ApiException;
-
- import org.chromium.base.annotations.CalledByNative;
- import org.chromium.base.annotations.NativeMethods;
- -import org.chromium.chrome.browser.sync.SyncService;
- import org.chromium.components.signin.base.CoreAccountInfo;
-
- /**
- @@ -40,12 +39,6 @@ class PasswordSyncControllerDelegateBridgeImpl {
- */
- @CalledByNative
- void notifyCredentialManagerWhenSyncing() {
- - mPasswordSyncControllerDelegate.notifyCredentialManagerWhenSyncing(
- - CoreAccountInfo.getEmailFrom(SyncService.get().getAccountInfo()), () -> {
- - if (mNativeDelegateBridgeImpl == 0) return;
- - PasswordSyncControllerDelegateBridgeImplJni.get().onCredentialManagerNotified(
- - mNativeDelegateBridgeImpl);
- - }, exception -> handleCredentialManagerException(exception));
- }
-
- /**
- diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
- --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
- +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
- @@ -30,14 +30,11 @@
- #include "chrome/browser/password_manager/account_password_store_factory.h"
- #include "chrome/browser/password_manager/field_info_manager_factory.h"
- #include "chrome/browser/password_manager/password_manager_settings_service_factory.h"
- -#include "chrome/browser/password_manager/password_reuse_manager_factory.h"
- #include "chrome/browser/password_manager/password_scripts_fetcher_factory.h"
- #include "chrome/browser/password_manager/password_store_factory.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
- #include "chrome/browser/safe_browsing/user_interaction_observer.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- -#include "chrome/browser/sync/sync_service_factory.h"
- #include "chrome/browser/touch_to_fill/touch_to_fill_webauthn_credential.h"
- #include "chrome/browser/translate/chrome_translate_client.h"
- #include "chrome/browser/ui/passwords/password_generation_popup_controller_impl.h"
- @@ -84,11 +81,7 @@
- #include "components/profile_metrics/browser_profile_type.h"
- #include "components/safe_browsing/buildflags.h"
- #include "components/sessions/content/content_record_password_state.h"
- -#include "components/signin/public/base/signin_metrics.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/site_isolation/site_isolation_policy.h"
- -#include "components/sync/driver/sync_service.h"
- -#include "components/sync/driver/sync_user_settings.h"
- #include "components/translate/core/browser/translate_manager.h"
- #include "components/version_info/version_info.h"
- #include "content/public/browser/back_forward_cache.h"
- @@ -126,9 +119,6 @@
- #if BUILDFLAG(IS_ANDROID)
- #include "chrome/browser/android/tab_android.h"
- #include "chrome/browser/autofill/manual_filling_controller.h"
- -#include "chrome/browser/password_manager/android/account_chooser_dialog_android.h"
- -#include "chrome/browser/password_manager/android/auto_signin_first_run_dialog_android.h"
- -#include "chrome/browser/password_manager/android/auto_signin_prompt_controller.h"
- #include "chrome/browser/password_manager/android/credential_leak_controller_android.h"
- #include "chrome/browser/password_manager/android/generated_password_saved_infobar_delegate_android.h"
- #include "chrome/browser/password_manager/android/password_accessory_controller.h"
- @@ -193,12 +183,6 @@ namespace {
- static const char kPasswordBreachEntryTrigger[] = "PASSWORD_ENTRY";
- #endif
-
- -const syncer::SyncService* GetSyncServiceForProfile(Profile* profile) {
- - if (SyncServiceFactory::HasSyncService(profile))
- - return SyncServiceFactory::GetForProfile(profile);
- - return nullptr;
- -}
- -
- // Adds |observer| to the input observers of |widget_host|.
- void AddToWidgetInputEventObservers(
- content::RenderWidgetHost* widget_host,
- @@ -295,10 +279,7 @@ bool ChromePasswordManagerClient::IsFillingFallbackEnabled(
- }
-
- bool ChromePasswordManagerClient::IsAutoSignInEnabled() const {
- - PasswordManagerSettingsService* settings_service =
- - PasswordManagerSettingsServiceFactory::GetForProfile(profile_);
- - return settings_service->IsSettingEnabled(
- - PasswordManagerSetting::kAutoSignIn);
- + return false;
- }
-
- bool ChromePasswordManagerClient::PromptUserToSaveOrUpdatePassword(
- @@ -426,13 +407,7 @@ bool ChromePasswordManagerClient::PromptUserToChooseCredentials(
- &PasswordManagerClientHelper::OnCredentialsChosen,
- base::Unretained(&helper_), std::move(callback), local_forms.size() == 1);
- #if BUILDFLAG(IS_ANDROID)
- - // Deletes itself on the event from Java counterpart, when user interacts with
- - // dialog.
- - AccountChooserDialogAndroid* acccount_chooser_dialog =
- - new AccountChooserDialogAndroid(web_contents(), /*client=*/this,
- - std::move(local_forms), origin,
- - std::move(intercept));
- - return acccount_chooser_dialog->ShowDialog();
- + return false;
- #else
- return PasswordsClientUIDelegateFromWebContents(web_contents())
- ->OnChooseCredentials(std::move(local_forms), origin,
- @@ -467,7 +442,6 @@ void ChromePasswordManagerClient::ShowTouchToFill(
-
- void ChromePasswordManagerClient::OnPasswordSelected(
- const std::u16string& text) {
- - password_reuse_detection_manager_.OnPaste(text);
- }
- #endif
-
- @@ -518,7 +492,7 @@ void ChromePasswordManagerClient::NotifyUserAutoSignin(
- DCHECK(!local_forms.empty());
- helper_.NotifyUserAutoSignin();
- #if BUILDFLAG(IS_ANDROID)
- - ShowAutoSigninPrompt(web_contents(), local_forms[0]->username_value);
- + // do nothing
- #else
- PasswordsClientUIDelegateFromWebContents(web_contents())
- ->OnAutoSignin(std::move(local_forms), origin);
- @@ -685,10 +659,6 @@ PrefService* ChromePasswordManagerClient::GetPrefs() const {
- return profile_->GetPrefs();
- }
-
- -const syncer::SyncService* ChromePasswordManagerClient::GetSyncService() const {
- - return GetSyncServiceForProfile(profile_);
- -}
- -
- password_manager::PasswordStoreInterface*
- ChromePasswordManagerClient::GetProfilePasswordStore() const {
- // Always use EXPLICIT_ACCESS as the password manager checks IsIncognito
- @@ -707,11 +677,6 @@ ChromePasswordManagerClient::GetAccountPasswordStore() const {
- .get();
- }
-
- -password_manager::PasswordReuseManager*
- -ChromePasswordManagerClient::GetPasswordReuseManager() const {
- - return PasswordReuseManagerFactory::GetForProfile(profile_);
- -}
- -
- password_manager::PasswordScriptsFetcher*
- ChromePasswordManagerClient::GetPasswordScriptsFetcher() {
- return PasswordScriptsFetcherFactory::GetForBrowserContext(profile_);
- @@ -723,13 +688,6 @@ ChromePasswordManagerClient::GetPasswordChangeSuccessTracker() {
- GetForBrowserContext(profile_);
- }
-
- -password_manager::SyncState ChromePasswordManagerClient::GetPasswordSyncState()
- - const {
- - const syncer::SyncService* sync_service =
- - SyncServiceFactory::GetForProfile(profile_);
- - return password_manager_util::GetPasswordSyncState(sync_service);
- -}
- -
- bool ChromePasswordManagerClient::WasLastNavigationHTTPError() const {
- DCHECK(web_contents());
-
- @@ -765,10 +723,7 @@ net::CertStatus ChromePasswordManagerClient::GetMainFrameCertStatus() const {
-
- void ChromePasswordManagerClient::PromptUserToEnableAutosignin() {
- #if BUILDFLAG(IS_ANDROID)
- - // Dialog is deleted by the Java counterpart after user interacts with it.
- - AutoSigninFirstRunDialogAndroid* auto_signin_first_run_dialog =
- - new AutoSigninFirstRunDialogAndroid(web_contents());
- - auto_signin_first_run_dialog->ShowDialog();
- + // do nothing
- #else
- PasswordsClientUIDelegateFromWebContents(web_contents())
- ->OnPromptEnableAutoSignin();
- @@ -833,10 +788,6 @@ url::Origin ChromePasswordManagerClient::GetLastCommittedOrigin() const {
- DCHECK(web_contents());
- return web_contents()->GetMainFrame()->GetLastCommittedOrigin();
- }
- -const password_manager::CredentialsFilter*
- -ChromePasswordManagerClient::GetStoreResultFilter() const {
- - return &credentials_filter_;
- -}
-
- const autofill::LogManager* ChromePasswordManagerClient::GetLogManager() const {
- return log_manager_.get();
- @@ -887,17 +838,6 @@ void ChromePasswordManagerClient::CheckSafeBrowsingReputation(
- }
- #endif // defined(ON_FOCUS_PING_ENABLED)
-
- -void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
- - PasswordType password_type,
- - const std::string& username,
- - const std::vector<password_manager::MatchingReusedCredential>&
- - matching_reused_credentials,
- - bool password_field_exists) {
- -}
- -
- -void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
- -}
- -
- #if !BUILDFLAG(IS_ANDROID)
- void ChromePasswordManagerClient::MaybeReportEnterpriseLoginEvent(
- const GURL& url,
- @@ -961,10 +901,6 @@ favicon::FaviconService* ChromePasswordManagerClient::GetFaviconService() {
- profile_, ServiceAccessType::EXPLICIT_ACCESS);
- }
-
- -signin::IdentityManager* ChromePasswordManagerClient::GetIdentityManager() {
- - return IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile());
- -}
- -
- scoped_refptr<network::SharedURLLoaderFactory>
- ChromePasswordManagerClient::GetURLLoaderFactory() {
- return profile_->GetDefaultStoragePartition()
- @@ -1194,18 +1130,14 @@ void ChromePasswordManagerClient::GenerationElementLostFocus() {
- #if BUILDFLAG(IS_ANDROID)
- void ChromePasswordManagerClient::OnImeTextCommittedEvent(
- const std::u16string& text_str) {
- - password_reuse_detection_manager_.OnKeyPressedCommitted(text_str);
- }
-
- void ChromePasswordManagerClient::OnImeSetComposingTextEvent(
- const std::u16string& text_str) {
- last_composing_text_ = text_str;
- - password_reuse_detection_manager_.OnKeyPressedUncommitted(
- - last_composing_text_);
- }
-
- void ChromePasswordManagerClient::OnImeFinishComposingTextEvent() {
- - password_reuse_detection_manager_.OnKeyPressedCommitted(last_composing_text_);
- last_composing_text_.clear();
- }
- #endif // BUILDFLAG(IS_ANDROID)
- @@ -1301,34 +1233,13 @@ ChromePasswordManagerClient::ChromePasswordManagerClient(
- profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
- password_manager_(this),
- password_feature_manager_(profile_->GetPrefs(),
- - SyncServiceFactory::GetForProfile(profile_)),
- + nullptr),
- httpauth_manager_(this),
- - password_reuse_detection_manager_(this),
- driver_factory_(nullptr),
- webauthn_credentials_delegate_(this),
- content_credential_manager_(this),
- password_generation_driver_receivers_(web_contents, this),
- observer_(nullptr),
- -#if BUILDFLAG(ENABLE_DICE_SUPPORT)
- - credentials_filter_(
- - this,
- - base::BindRepeating(&GetSyncServiceForProfile, profile_),
- - DiceWebSigninInterceptorFactory::GetForProfile(profile_)),
- - account_storage_auth_helper_(
- - IdentityManagerFactory::GetForProfile(profile_),
- - &password_feature_manager_,
- - base::BindRepeating(
- - [](content::WebContents* web_contents) {
- - Browser* browser =
- - chrome::FindBrowserWithWebContents(web_contents);
- - return browser ? browser->signin_view_controller() : nullptr;
- - },
- - web_contents)),
- -#else
- - credentials_filter_(
- - this,
- - base::BindRepeating(&GetSyncServiceForProfile, profile_)),
- -#endif
- helper_(this) {
- ContentPasswordManagerDriverFactory::CreateForWebContents(web_contents, this,
- autofill_client);
- @@ -1364,8 +1275,6 @@ void ChromePasswordManagerClient::PrimaryPageChanged(content::Page& page) {
- // requests.
- content_credential_manager_.DisconnectBinding();
-
- - password_reuse_detection_manager_.DidNavigateMainFrame(GetLastCommittedURL());
- -
- AddToWidgetInputEventObservers(page.GetMainDocument().GetRenderWidgetHost(),
- this);
-
- @@ -1437,7 +1346,6 @@ void ChromePasswordManagerClient::OnPaste() {
- }
-
- was_on_paste_called_ = true;
- - password_reuse_detection_manager_.OnPaste(std::move(text));
- }
- #endif
-
- @@ -1460,10 +1368,6 @@ void ChromePasswordManagerClient::OnInputEvent(
- // Android keyboard, ImeTextCommittedEvent is triggered instead.
- if (event.GetType() != blink::WebInputEvent::Type::kKeyDown)
- return;
- - const blink::WebKeyboardEvent& key_event =
- - static_cast<const blink::WebKeyboardEvent&>(event);
- - password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
- -
- #else // !BUILDFLAG(IS_ANDROID)
- if (event.GetType() != blink::WebInputEvent::Type::kChar)
- return;
- @@ -1473,8 +1377,6 @@ void ChromePasswordManagerClient::OnInputEvent(
- // command key is pressed. This detects CTRL+V, COMMAND+V, and CTRL+SHIFT+V.
- if (key_event.windows_key_code == (ui::VKEY_V & 0x1f)) {
- OnPaste();
- - } else {
- - password_reuse_detection_manager_.OnKeyPressedCommitted(key_event.text);
- }
- #endif // BUILDFLAG(IS_ANDROID)
- }
- @@ -1540,19 +1442,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
- // static
- bool ChromePasswordManagerClient::ShouldAnnotateNavigationEntries(
- Profile* profile) {
- - // Only annotate PasswordState onto the navigation entry if user is
- - // opted into UMA and they're not syncing w/ a custom passphrase.
- - if (!ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled())
- - return false;
- -
- - syncer::SyncService* sync_service =
- - SyncServiceFactory::GetForProfile(profile);
- - if (!sync_service || !sync_service->IsSyncFeatureActive() ||
- - sync_service->GetUserSettings()->IsUsingExplicitPassphrase()) {
- return false;
- - }
- -
- - return true;
- }
-
- void ChromePasswordManagerClient::GenerationResultAvailable(
- diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
- --- a/chrome/browser/password_manager/chrome_password_manager_client.h
- +++ b/chrome/browser/password_manager/chrome_password_manager_client.h
- @@ -31,12 +31,9 @@
- #include "components/password_manager/core/browser/password_manager_client_helper.h"
- #include "components/password_manager/core/browser/password_manager_metrics_recorder.h"
- #include "components/password_manager/core/browser/password_manager_metrics_util.h"
- -#include "components/password_manager/core/browser/password_reuse_detection_manager.h"
- -#include "components/password_manager/core/browser/password_reuse_detector.h"
- #include "components/prefs/pref_member.h"
- #include "components/safe_browsing/buildflags.h"
- #include "components/signin/public/base/signin_buildflags.h"
- -#include "components/sync/driver/sync_service.h"
- #include "content/public/browser/render_frame_host_receiver_set.h"
- #include "content/public/browser/render_widget_host.h"
- #include "content/public/browser/web_contents_observer.h"
- @@ -57,8 +54,6 @@ class TouchToFillController;
- #if BUILDFLAG(ENABLE_DICE_SUPPORT)
- #include "chrome/browser/password_manager/multi_profile_credentials_filter.h"
- #include "chrome/browser/ui/passwords/account_storage_auth_helper.h"
- -#else
- -#include "components/password_manager/core/browser/sync_credentials_filter.h"
- #endif
-
- class PasswordGenerationPopupObserver;
- @@ -184,18 +179,14 @@ class ChromePasswordManagerClient
- base::OnceCallback<void(ReauthSucceeded)> reauth_callback) override;
- void TriggerSignIn(signin_metrics::AccessPoint access_point) override;
- PrefService* GetPrefs() const override;
- - const syncer::SyncService* GetSyncService() const override;
- password_manager::PasswordStoreInterface* GetProfilePasswordStore()
- const override;
- password_manager::PasswordStoreInterface* GetAccountPasswordStore()
- const override;
- - password_manager::PasswordReuseManager* GetPasswordReuseManager()
- - const override;
- password_manager::PasswordScriptsFetcher* GetPasswordScriptsFetcher()
- override;
- password_manager::PasswordChangeSuccessTracker*
- GetPasswordChangeSuccessTracker() override;
- - password_manager::SyncState GetPasswordSyncState() const override;
- bool WasLastNavigationHTTPError() const override;
-
- net::CertStatus GetMainFrameCertStatus() const override;
- @@ -211,8 +202,6 @@ class ChromePasswordManagerClient
- bool IsCommittedMainFrameSecure() const override;
- const GURL& GetLastCommittedURL() const override;
- url::Origin GetLastCommittedOrigin() const override;
- - const password_manager::CredentialsFilter* GetStoreResultFilter()
- - const override;
- const autofill::LogManager* GetLogManager() const override;
- void AnnotateNavigationEntry(bool has_password_field) override;
- autofill::LanguageCode GetPageLanguage() const override;
- @@ -225,15 +214,6 @@ class ChromePasswordManagerClient
- const GURL& frame_url) override;
- #endif
-
- - void CheckProtectedPasswordEntry(
- - password_manager::metrics_util::PasswordType reused_password_type,
- - const std::string& username,
- - const std::vector<password_manager::MatchingReusedCredential>&
- - matching_reused_credentials,
- - bool password_field_exists) override;
- -
- - void LogPasswordReuseDetectedEvent() override;
- -
- // Reporting these events is only supported on desktop platforms.
- #if !BUILDFLAG(IS_ANDROID)
- void MaybeReportEnterpriseLoginEvent(
- @@ -252,7 +232,6 @@ class ChromePasswordManagerClient
- password_manager::PasswordRequirementsService*
- GetPasswordRequirementsService() override;
- favicon::FaviconService* GetFaviconService() override;
- - signin::IdentityManager* GetIdentityManager() override;
- scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory() override;
- network::mojom::NetworkContext* GetNetworkContext() const override;
- void UpdateFormManagers() override;
- @@ -377,8 +356,6 @@ class ChromePasswordManagerClient
- password_manager::PasswordManager password_manager_;
- password_manager::PasswordFeatureManagerImpl password_feature_manager_;
- password_manager::HttpAuthManagerImpl httpauth_manager_;
- - password_manager::PasswordReuseDetectionManager
- - password_reuse_detection_manager_;
-
- #if BUILDFLAG(IS_ANDROID)
- // Holds and facilitates a credential store for each origin in this tab.
- @@ -421,8 +398,6 @@ class ChromePasswordManagerClient
- // MultiProfileCredentialsFilter requires DICE support.
- const MultiProfileCredentialsFilter credentials_filter_;
- AccountStorageAuthHelper account_storage_auth_helper_;
- -#else
- - const password_manager::SyncCredentialsFilter credentials_filter_;
- #endif
-
- std::unique_ptr<autofill::LogManager> log_manager_;
- diff --git a/chrome/browser/password_manager/password_manager_settings_service_factory.cc b/chrome/browser/password_manager/password_manager_settings_service_factory.cc
- --- a/chrome/browser/password_manager/password_manager_settings_service_factory.cc
- +++ b/chrome/browser/password_manager/password_manager_settings_service_factory.cc
- @@ -7,7 +7,6 @@
- #include "chrome/browser/password_manager/password_manager_settings_service_impl.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/sync/sync_service_factory.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/password_manager/core/browser/password_manager_settings_service.h"
- #include "components/password_manager/core/common/password_manager_features.h"
- @@ -34,7 +33,6 @@ PasswordManagerSettingsServiceFactory::PasswordManagerSettingsServiceFactory()
- : BrowserContextKeyedServiceFactory(
- "PasswordManagerSettingsService",
- BrowserContextDependencyManager::GetInstance()) {
- - DependsOn(SyncServiceFactory::GetInstance());
- }
-
- PasswordManagerSettingsServiceFactory::
- @@ -44,10 +42,6 @@ KeyedService* PasswordManagerSettingsServiceFactory::BuildServiceInstanceFor(
- content::BrowserContext* context) const {
- Profile* profile = Profile::FromBrowserContext(context);
- #if BUILDFLAG(IS_ANDROID)
- - if (password_manager::features::UsesUnifiedPasswordManagerUi()) {
- - return new PasswordManagerSettingsServiceAndroidImpl(
- - profile->GetPrefs(), SyncServiceFactory::GetForProfile(profile));
- - }
- // Reset the migration pref in case the client is no longer in the enabled
- // group.
- profile->GetPrefs()->SetBoolean(
- diff --git a/chrome/browser/privacy/BUILD.gn b/chrome/browser/privacy/BUILD.gn
- --- a/chrome/browser/privacy/BUILD.gn
- +++ b/chrome/browser/privacy/BUILD.gn
- @@ -15,8 +15,6 @@ if (is_android) {
- "//chrome/browser/feed/android:*",
- "//chrome/browser/ui/android/omnibox:java",
- "//chrome/browser/ui/android/omnibox:junit",
- - "//chrome/browser/ui/android/signin:java",
- - "//chrome/browser/ui/android/signin:junit",
- ]
- sources = [
- "java/src/org/chromium/chrome/browser/privacy/secure_dns/SecureDnsBridge.java",
- diff --git a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
- --- a/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
- +++ b/chrome/browser/privacy_review/android/java/res/layout/privacy_review_msbb_step.xml
- @@ -26,14 +26,6 @@
- android:src="@drawable/privacy_review_msbb_image"
- android:importantForAccessibility="no" />
-
- - <com.google.android.material.switchmaterial.SwitchMaterial
- - android:id="@+id/msbb_switch"
- - android:layout_marginHorizontal="16dp"
- - android:layout_width="match_parent"
- - android:layout_height="wrap_content"
- - android:showText="false"
- - android:text="@string/url_keyed_anonymized_data_title" />
- -
- <org.chromium.chrome.browser.privacy_review.PrivacyReviewExplanationHeading
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
- --- a/chrome/browser/profiles/profile_impl.cc
- +++ b/chrome/browser/profiles/profile_impl.cc
- @@ -91,8 +91,6 @@
- #include "chrome/browser/push_messaging/push_messaging_service_impl.h"
- #include "chrome/browser/sessions/exit_type_service.h"
- #include "chrome/browser/sharing/sharing_service_factory.h"
- -#include "chrome/browser/signin/identity_manager_factory.h"
- -#include "chrome/browser/signin/signin_ui_util.h"
- #include "chrome/browser/ssl/https_first_mode_settings_tracker.h"
- #include "chrome/browser/ssl/stateful_ssl_host_state_delegate_factory.h"
- #include "chrome/browser/startup_data.h"
- @@ -145,7 +143,6 @@
- #include "components/profile_metrics/browser_profile_type.h"
- #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h"
- #include "components/signin/public/base/signin_pref_names.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- #include "components/site_isolation/site_isolation_policy.h"
- #include "components/spellcheck/spellcheck_buildflags.h"
- #include "components/sync_preferences/pref_service_syncable.h"
- @@ -923,13 +920,6 @@ ProfileImpl::~ProfileImpl() {
- }
-
- std::string ProfileImpl::GetProfileUserName() const {
- - const signin::IdentityManager* identity_manager =
- - IdentityManagerFactory::GetForProfileIfExists(this);
- - if (identity_manager) {
- - return identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSync)
- - .email;
- - }
- -
- return std::string();
- }
-
- @@ -1501,10 +1491,7 @@ void ProfileImpl::SetCreationTimeForTesting(base::Time creation_time) {
- }
-
- bool ProfileImpl::IsSignedIn() {
- - signin::IdentityManager* identity_manager =
- - IdentityManagerFactory::GetForProfile(this);
- - return identity_manager &&
- - identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync);
- + return false;
- }
-
- GURL ProfileImpl::GetHomePage() {
- diff --git a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
- --- a/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
- +++ b/chrome/browser/safe_browsing/verdict_cache_manager_factory.cc
- @@ -9,7 +9,6 @@
- #include "chrome/browser/history/history_service_factory.h"
- #include "chrome/browser/profiles/incognito_helpers.h"
- #include "chrome/browser/profiles/profile.h"
- -#include "chrome/browser/sync/sync_service_factory.h"
- #include "components/keyed_service/content/browser_context_dependency_manager.h"
- #include "components/safe_browsing/core/browser/sync/safe_browsing_sync_observer_impl.h"
- #include "components/safe_browsing/core/browser/verdict_cache_manager.h"
- @@ -35,7 +34,6 @@ VerdictCacheManagerFactory::VerdictCacheManagerFactory()
- BrowserContextDependencyManager::GetInstance()) {
- DependsOn(HistoryServiceFactory::GetInstance());
- DependsOn(HostContentSettingsMapFactory::GetInstance());
- - DependsOn(SyncServiceFactory::GetInstance());
- }
-
- KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor(
- @@ -46,8 +44,7 @@ KeyedService* VerdictCacheManagerFactory::BuildServiceInstanceFor(
- ServiceAccessType::EXPLICIT_ACCESS),
- HostContentSettingsMapFactory::GetForProfile(profile),
- profile->GetPrefs(),
- - std::make_unique<SafeBrowsingSyncObserverImpl>(
- - SyncServiceFactory::GetForProfile(profile)));
- + std::make_unique<SafeBrowsingSyncObserverImpl>(nullptr));
- }
-
- content::BrowserContext* VerdictCacheManagerFactory::GetBrowserContextToUse(
- diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
- --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
- +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/DevicePickerBottomSheetContent.java
- @@ -27,14 +27,10 @@ import org.chromium.chrome.browser.browserservices.intents.WebappConstants;
- import org.chromium.chrome.browser.document.ChromeLauncherActivity;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
- import org.chromium.components.embedder_support.util.UrlConstants;
- -import org.chromium.components.signin.base.AccountInfo;
- -import org.chromium.components.signin.identitymanager.ConsentLevel;
- -import org.chromium.components.signin.identitymanager.IdentityManager;
- import org.chromium.ui.text.NoUnderlineClickableSpan;
- import org.chromium.ui.text.SpanApplier;
- import org.chromium.ui.widget.Toast;
- @@ -108,41 +104,6 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte
- ListView listView = mContentView.findViewById(R.id.device_picker_list);
- listView.setAdapter(mAdapter);
- listView.setOnItemClickListener(this);
- -
- - createManageDevicesLink(listView);
- - }
- -
- - private void createManageDevicesLink(ListView deviceListView) {
- - ViewGroup containerView = (ViewGroup) LayoutInflater.from(mContext).inflate(
- - R.layout.send_tab_to_self_manage_devices_link, null);
- - deviceListView.addFooterView(containerView);
- -
- - AccountInfo account = getSharingAccountInfo();
- - assert account != null : "The user must be signed in to share a tab";
- -
- - // The avatar can be null in tests.
- - if (account.getAccountImage() != null) {
- - RoundedCornerImageView avatarView = containerView.findViewById(R.id.account_avatar);
- - int accountAvatarSizePx = Math.round(
- - ACCOUNT_AVATAR_SIZE_DP * mContext.getResources().getDisplayMetrics().density);
- - avatarView.setImageBitmap(Bitmap.createScaledBitmap(
- - account.getAccountImage(), accountAvatarSizePx, accountAvatarSizePx, false));
- - avatarView.setRoundedCorners(accountAvatarSizePx / 2, accountAvatarSizePx / 2,
- - accountAvatarSizePx / 2, accountAvatarSizePx / 2);
- - }
- -
- - Resources resources = mContext.getResources();
- - // The link is opened in a new tab to avoid exiting the current page, which the user
- - // possibly wants to share (maybe they just clicked "Manage devices" by mistake).
- - SpannableString linkText = SpanApplier.applySpans(
- - resources.getString(
- - R.string.send_tab_to_self_manage_devices_link, account.getEmail()),
- - new SpanApplier.SpanInfo("<link>", "</link>",
- - new NoUnderlineClickableSpan(
- - mContext, this::openManageDevicesPageInNewTab)));
- - TextView linkView = containerView.findViewById(R.id.manage_devices_link);
- - linkView.setText(linkText);
- - linkView.setMovementMethod(LinkMovementMethod.getInstance());
- }
-
- private void openManageDevicesPageInNewTab(View unused) {
- @@ -252,11 +213,4 @@ public class DevicePickerBottomSheetContent implements BottomSheetContent, OnIte
-
- mController.hideContent(this, true);
- }
- -
- - private static AccountInfo getSharingAccountInfo() {
- - IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- - Profile.getLastUsedRegularProfile());
- - return identityManager.findExtendedAccountInfoByEmailAddress(
- - identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN).getEmail());
- - }
- }
- diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
- --- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
- +++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/send_tab_to_self/SendTabToSelfCoordinator.java
- @@ -11,17 +11,7 @@ import org.chromium.base.Callback;
- import org.chromium.base.Promise;
- import org.chromium.chrome.browser.flags.ChromeFeatureList;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- -import org.chromium.chrome.browser.signin.services.SigninManager;
- -import org.chromium.chrome.browser.sync.SyncService;
- -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator;
- -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerBottomSheetCoordinator.EntryPoint;
- -import org.chromium.chrome.browser.ui.signin.account_picker.AccountPickerDelegate;
- import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
- -import org.chromium.components.signin.AccountManagerFacadeProvider;
- -import org.chromium.components.signin.AccountUtils;
- -import org.chromium.components.signin.base.GoogleServiceAuthError;
- -import org.chromium.components.sync.ModelType;
- import org.chromium.ui.base.WindowAndroid;
-
- import java.util.List;
- @@ -30,70 +20,6 @@ import java.util.List;
- * Coordinator for displaying the send tab to self feature.
- */
- public class SendTabToSelfCoordinator {
- - /** Waits for Sync to download the list of target devices after sign-in. */
- - private static class TargetDeviceListWaiter implements SyncService.SyncStateChangedListener {
- - private final Promise<Void> mPromise = new Promise<Void>();
- -
- - public TargetDeviceListWaiter() {
- - SyncService.get().addSyncStateChangedListener(this);
- - fullfillIfReady();
- - }
- -
- - public Promise<Void> waitUntilReady() {
- - return mPromise;
- - }
- -
- - @Override
- - public void syncStateChanged() {
- - fullfillIfReady();
- - }
- -
- - private void fullfillIfReady() {
- - if (SyncService.get().getActiveDataTypes().contains(ModelType.DEVICE_INFO)) {
- - SyncService.get().removeSyncStateChangedListener(this);
- - mPromise.fulfill(null);
- - }
- - }
- - }
- -
- - /** Performs sign-in for the promo shown to signed-out users. */
- - private static class SendTabToSelfAccountPickerDelegate implements AccountPickerDelegate {
- - private final Runnable mShowDeviceListCallback;
- -
- - public SendTabToSelfAccountPickerDelegate(Runnable showDeviceListCallback) {
- - mShowDeviceListCallback = showDeviceListCallback;
- - }
- -
- - @Override
- - public void destroy() {}
- -
- - @Override
- - public void signIn(
- - String accountEmail, Callback<GoogleServiceAuthError> onSignInErrorCallback) {
- - SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
- - Profile.getLastUsedRegularProfile());
- - Account account = AccountUtils.createAccountFromName(accountEmail);
- - signinManager.signin(account, new SigninManager.SignInCallback() {
- - @Override
- - public void onSignInComplete() {
- - new TargetDeviceListWaiter().waitUntilReady().then(
- - unused -> { mShowDeviceListCallback.run(); });
- - }
- -
- - @Override
- - public void onSignInAborted() {
- - // TODO(crbug.com/1219434) Consider calling onSignInErrorCallback here.
- - }
- - });
- - }
- -
- - @Override
- - @EntryPoint
- - public int getEntryPoint() {
- - return EntryPoint.SEND_TAB_TO_SELF;
- - }
- - }
- -
- private final Context mContext;
- private final WindowAndroid mWindowAndroid;
- private final String mUrl;
- @@ -110,18 +36,7 @@ public class SendTabToSelfCoordinator {
- }
-
- public void show() {
- - if (!shouldOfferSignInPromo()) {
- showDeviceList();
- - return;
- - }
- -
- - Runnable showDeviceListCallback = () -> {
- - // TODO(crbug.com/1219434): The sign-in promo should close itself instead.
- - mController.hideContent(mController.getCurrentSheetContent(), /*animate=*/true);
- - showDeviceList();
- - };
- - new AccountPickerBottomSheetCoordinator(mWindowAndroid, mController,
- - new SendTabToSelfAccountPickerDelegate(showDeviceListCallback));
- }
-
- private void showDeviceList() {
- @@ -130,23 +45,6 @@ public class SendTabToSelfCoordinator {
- }
-
- private boolean shouldOfferSignInPromo() {
- - // There should be some account on the device that can sign in to Chrome.
- - List<Account> accounts = AccountUtils.getAccountsIfFulfilledOrEmpty(
- - AccountManagerFacadeProvider.getInstance().getAccounts());
- - if (accounts.isEmpty()) {
- - return false;
- - }
- -
- - Profile profile = Profile.getLastUsedRegularProfile();
- - if (!IdentityServicesProvider.get().getSigninManager(profile).isSigninAllowed()) {
- - return false;
- - }
- -
- - // There should be no account signed in to Chrome yet.
- - if (SyncService.get().getAccountInfo() != null) {
- - return false;
- - }
- -
- - return ChromeFeatureList.isEnabled(ChromeFeatureList.SEND_TAB_TO_SELF_SIGNIN_PROMO);
- + return false;
- }
- }
- diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.cc b/chrome/browser/ui/android/infobars/save_password_infobar.cc
- --- a/chrome/browser/ui/android/infobars/save_password_infobar.cc
- +++ b/chrome/browser/ui/android/infobars/save_password_infobar.cc
- @@ -41,14 +41,11 @@ SavePasswordInfoBar::CreateRenderInfoBar(
- ConvertUTF16ToJavaString(env, save_password_delegate->GetMessageText());
- ScopedJavaLocalRef<jstring> details_message_text = ConvertUTF16ToJavaString(
- env, save_password_delegate->GetDetailsMessageText());
- - ScopedJavaLocalRef<jobject> account_info =
- - !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_)
- - : nullptr;
-
- base::android::ScopedJavaLocalRef<jobject> infobar;
- infobar.Reset(Java_SavePasswordInfoBar_show(
- env, resource_id_mapper.Run(delegate()->GetIconId()), message_text,
- - details_message_text, ok_button_text, cancel_button_text, account_info));
- + details_message_text, ok_button_text, cancel_button_text));
-
- java_infobar_.Reset(env, infobar.obj());
- return infobar;
- diff --git a/chrome/browser/ui/android/infobars/update_password_infobar.cc b/chrome/browser/ui/android/infobars/update_password_infobar.cc
- --- a/chrome/browser/ui/android/infobars/update_password_infobar.cc
- +++ b/chrome/browser/ui/android/infobars/update_password_infobar.cc
- @@ -45,9 +45,6 @@ UpdatePasswordInfoBar::CreateRenderInfoBar(
- ConvertUTF16ToJavaString(env, update_password_delegate->GetMessageText());
- ScopedJavaLocalRef<jstring> details_message_text = ConvertUTF16ToJavaString(
- env, update_password_delegate->GetDetailsMessageText());
- - ScopedJavaLocalRef<jobject> account_info =
- - !account_info_.IsEmpty() ? ConvertToJavaAccountInfo(env, account_info_)
- - : nullptr;
- std::vector<std::u16string> usernames;
- unsigned int selected_username =
- update_password_delegate->GetDisplayUsernames(&usernames);
- @@ -57,8 +54,7 @@ UpdatePasswordInfoBar::CreateRenderInfoBar(
- base::android::ScopedJavaLocalRef<jobject> infobar;
- infobar.Reset(Java_UpdatePasswordInfoBar_show(
- env, resource_id_mapper.Run(delegate()->GetIconId()), display_usernames,
- - selected_username, message_text, details_message_text, ok_button_text,
- - account_info));
- + selected_username, message_text, details_message_text, ok_button_text));
-
- java_infobar_.Reset(env, infobar.obj());
- return infobar;
- diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
- --- a/chrome/browser/ui/android/omnibox/BUILD.gn
- +++ b/chrome/browser/ui/android/omnibox/BUILD.gn
- @@ -156,7 +156,6 @@ android_library("java") {
- "//chrome/browser/profiles/android:java",
- "//chrome/browser/search_engines/android:java",
- "//chrome/browser/share:java",
- - "//chrome/browser/signin/services/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/tabmodel:java",
- "//chrome/browser/ui/android/favicon:java",
- @@ -396,7 +395,6 @@ android_library("junit") {
- "//chrome/browser/prefetch/android:java",
- "//chrome/browser/privacy:java",
- "//chrome/browser/profiles/android:java",
- - "//chrome/browser/signin/services/android:java",
- "//chrome/browser/tab:java",
- "//chrome/browser/ui/android/favicon:java",
- "//chrome/browser/ui/android/theme:java",
- diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
- --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
- +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
- @@ -55,7 +55,6 @@ import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsBridge;
- import org.chromium.chrome.browser.prefetch.settings.PreloadPagesState;
- import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
- import org.chromium.chrome.browser.profiles.Profile;
- -import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
- import org.chromium.chrome.browser.tab.Tab;
- import org.chromium.chrome.browser.theme.ThemeUtils;
- import org.chromium.chrome.browser.ui.native_page.NativePage;
- diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
- --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
- +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
- @@ -306,9 +306,6 @@ CHAR_LIMIT guidelines:
- <message name="IDS_SIGN_IN_TO_CHROME" desc="Title for the button to sign in to Chrome using one's Google account. [CHAR_LIMIT=27]">
- Sign in to Chrome
- </message>
- - <message name="IDS_PREFS_MANAGE_SYNC_SETTINGS_CONTENT_DESCRIPTION" is_accessibility_with_no_ui="true" desc="The accessibility text to read when the 'Manage Sync Settings' page is opened from the sign-in page. This text is attached to the 'Navigate Up' button shown at the top of the screen. The first two sentences describe the screen that is currently shown to the user, while 'Navigate up' is a description for the button this text is attached to. 'Navigate up' should match TC ID 6794660482873516081.">
- - You are currently customizing your Sync settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up
- - </message>
- <message name="IDS_SIGNIN_PREF_SUMMARY" desc="Summary for the entry in Settings to sign in to Chrome, explaining benefits of signing in.">
- Sync and personalize across devices
- </message>
- @@ -418,21 +415,6 @@ CHAR_LIMIT guidelines:
- <message name="IDS_PRELOAD_PAGES_EXTENDED_PRELOADING_BULLET_FOUR" desc="Fourth bullet point under the Preload Pages extended preloading mode. Informs the user about what the extended preloading setting does.">
- Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account.
- </message>
- - <message name="IDS_URL_KEYED_ANONYMIZED_DATA_TITLE" desc="Title for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
- - Make searches and browsing better
- - </message>
- - <message name="IDS_URL_KEYED_ANONYMIZED_DATA_SUMMARY" desc="Summary for a checkbox in Settings that controls non-personalized URL collection and informs the user about the data shared by this feature.">
- - Sends URLs of pages you visit to Google
- - </message>
- - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_LEGACY" desc="The text for Privacy preferences that is shown after all preference rows.">
- - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK"><link></ph>Sync and Google services<ph name="END_LINK"></link></ph>
- - </message>
- - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_SYNC_ON" desc="The text for Privacy preferences that is shown after all preference rows. This version of the text is shown if Sync has been turned on.">
- - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK1"><link1></ph>Sync<ph name="END_LINK1"></link1></ph> and <ph name="BEGIN_LINK2"><link2></ph>Google services<ph name="END_LINK2"></link2></ph>
- - </message>
- - <message name="IDS_PRIVACY_SYNC_AND_SERVICES_LINK_SYNC_OFF" desc="The text for Privacy preferences that is shown after all preference rows. This version of the text is shown if Sync hasn't been turned on.">
- - For more settings that relate to privacy, security, and data collection, see <ph name="BEGIN_LINK"><link></ph>Google services<ph name="END_LINK"></link></ph>
- - </message>
-
- <!-- Metrics settings -->
- <message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
- diff --git a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
- --- a/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
- +++ b/components/autofill_assistant/android/public/java/src/org/chromium/components/autofill_assistant/AssistantStaticDependencies.java
- @@ -54,9 +54,6 @@ public interface AssistantStaticDependencies {
-
- AssistantSettingsUtil createSettingsUtil();
-
- - @CalledByNative
- - AssistantAccessTokenUtil createAccessTokenUtil();
- -
- BrowserContextHandle getBrowserContext();
-
- @CalledByNative
- diff --git a/components/autofill_assistant/browser/android/dependencies_android.cc b/components/autofill_assistant/browser/android/dependencies_android.cc
- --- a/components/autofill_assistant/browser/android/dependencies_android.cc
- +++ b/components/autofill_assistant/browser/android/dependencies_android.cc
- @@ -51,13 +51,6 @@ ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateInfoPageUtil() const {
- AttachCurrentThread(), jstatic_dependencies_));
- }
-
- -ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateAccessTokenUtil()
- - const {
- - return ScopedJavaGlobalRef<jobject>(
- - Java_AssistantStaticDependencies_createAccessTokenUtil(
- - AttachCurrentThread(), jstatic_dependencies_));
- -}
- -
- ScopedJavaGlobalRef<jobject> DependenciesAndroid::CreateImageFetcher() const {
- return ScopedJavaGlobalRef<jobject>(
- Java_AssistantStaticDependencies_createImageFetcher(
- diff --git a/components/autofill_assistant/browser/common_dependencies.h b/components/autofill_assistant/browser/common_dependencies.h
- --- a/components/autofill_assistant/browser/common_dependencies.h
- +++ b/components/autofill_assistant/browser/common_dependencies.h
- @@ -62,9 +62,6 @@ class CommonDependencies {
-
- virtual bool IsWebLayer() const = 0;
-
- - virtual signin::IdentityManager* GetIdentityManager(
- - content::BrowserContext* browser_context) const = 0;
- -
- virtual version_info::Channel GetChannel() const = 0;
- };
-
- diff --git a/components/autofill_assistant/browser/headless/client_headless.cc b/components/autofill_assistant/browser/headless/client_headless.cc
- --- a/components/autofill_assistant/browser/headless/client_headless.cc
- +++ b/components/autofill_assistant/browser/headless/client_headless.cc
- @@ -19,7 +19,6 @@
- #include "components/autofill_assistant/browser/empty_website_login_manager_impl.h"
- #include "components/autofill_assistant/browser/features.h"
- #include "components/autofill_assistant/browser/public/ui_state.h"
- -#include "components/autofill_assistant/browser/service/access_token_fetcher.h"
- #include "components/autofill_assistant/browser/switches.h"
- #include "components/autofill_assistant/browser/website_login_manager_impl.h"
- #include "components/password_manager/content/browser/password_change_success_tracker_factory.h"
- @@ -37,9 +36,6 @@
-
- namespace autofill_assistant {
-
- -const char kOAuth2Scope[] = "https://www.googleapis.com/auth/userinfo.profile";
- -const char kConsumerName[] = "autofill_assistant";
- -
- ClientHeadless::ClientHeadless(
- content::WebContents* web_contents,
- const CommonDependencies* common_dependencies,
- @@ -175,14 +171,6 @@ void ClientHeadless::FetchAccessToken(
- base::OnceCallback<void(bool, const std::string&)> callback) {
- DCHECK(!fetch_access_token_callback_);
- fetch_access_token_callback_ = std::move(callback);
- - auto* identity_manager = common_dependencies_->GetIdentityManager(
- - GetWebContents()->GetBrowserContext());
- - access_token_fetcher_ = identity_manager->CreateAccessTokenFetcherForAccount(
- - identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync),
- - kConsumerName, {kOAuth2Scope},
- - base::BindOnce(&ClientHeadless::OnAccessTokenFetchComplete,
- - weak_ptr_factory_.GetWeakPtr()),
- - signin::AccessTokenFetcher::Mode::kImmediate);
- }
-
- void ClientHeadless::OnAccessTokenFetchComplete(
- @@ -203,11 +191,6 @@ void ClientHeadless::OnAccessTokenFetchComplete(
- }
-
- void ClientHeadless::InvalidateAccessToken(const std::string& access_token) {
- - auto* identity_manager = common_dependencies_->GetIdentityManager(
- - GetWebContents()->GetBrowserContext());
- - identity_manager->RemoveAccessTokenFromCache(
- - identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kSync),
- - {kOAuth2Scope}, access_token);
- }
-
- } // namespace autofill_assistant
- diff --git a/components/autofill_assistant/browser/headless/client_headless.h b/components/autofill_assistant/browser/headless/client_headless.h
- --- a/components/autofill_assistant/browser/headless/client_headless.h
- +++ b/components/autofill_assistant/browser/headless/client_headless.h
- @@ -89,7 +89,6 @@ class ClientHeadless : public Client, public AccessTokenFetcher {
- std::unique_ptr<WebsiteLoginManager> website_login_manager_;
- std::unique_ptr<HeadlessUiController> headless_ui_controller_;
- raw_ptr<signin::IdentityManager> identity_manager_ = nullptr;
- - std::unique_ptr<signin::AccessTokenFetcher> access_token_fetcher_;
- base::OnceCallback<void(bool, const std::string&)>
- fetch_access_token_callback_;
-
- diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h
- --- a/components/omnibox/browser/autocomplete_provider_client.h
- +++ b/components/omnibox/browser/autocomplete_provider_client.h
- @@ -52,10 +52,6 @@ namespace component_updater {
- class ComponentUpdateService;
- }
-
- -namespace signin {
- -class IdentityManager;
- -}
- -
- namespace query_tiles {
- class TileService;
- }
- @@ -125,9 +121,6 @@ class AutocompleteProviderClient : public OmniboxAction::Client {
- virtual component_updater::ComponentUpdateService*
- GetComponentUpdateService() = 0;
-
- - // Returns the signin::IdentityManager associated with the current profile.
- - virtual signin::IdentityManager* GetIdentityManager() const = 0;
- -
- virtual bool IsOffTheRecord() const = 0;
- virtual bool IsAlwaysIncognitoEnabled() const = 0;
- virtual bool SearchSuggestEnabled() const = 0;
- diff --git a/components/password_manager/core/browser/BUILD.gn b/components/password_manager/core/browser/BUILD.gn
- --- a/components/password_manager/core/browser/BUILD.gn
- +++ b/components/password_manager/core/browser/BUILD.gn
- @@ -174,15 +174,6 @@ static_library("browser") {
- "password_notes_table.h",
- "password_requirements_service.cc",
- "password_requirements_service.h",
- - "password_reuse_detection_manager.cc",
- - "password_reuse_detection_manager.h",
- - "password_reuse_detector.cc",
- - "password_reuse_detector.h",
- - "password_reuse_detector_consumer.cc",
- - "password_reuse_detector_consumer.h",
- - "password_reuse_manager.h",
- - "password_reuse_manager_impl.cc",
- - "password_reuse_manager_impl.h",
- "password_save_manager.h",
- "password_save_manager_impl.cc",
- "password_save_manager_impl.h",
- diff --git a/components/password_manager/core/browser/leak_detection_delegate.cc b/components/password_manager/core/browser/leak_detection_delegate.cc
- --- a/components/password_manager/core/browser/leak_detection_delegate.cc
- +++ b/components/password_manager/core/browser/leak_detection_delegate.cc
- @@ -64,7 +64,7 @@ void LeakDetectionDelegate::StartLeakCheck(
- is_likely_signup_form_ = submitted_form_was_likely_signup_form;
-
- leak_check_ = leak_factory_->TryCreateLeakCheck(
- - this, client_->GetIdentityManager(), client_->GetURLLoaderFactory(),
- + this, nullptr, client_->GetURLLoaderFactory(),
- client_->GetChannel());
- // Reset the helper to avoid notifications from the currently running check.
- helper_.reset();
- diff --git a/components/password_manager/core/browser/password_form_manager.cc b/components/password_manager/core/browser/password_form_manager.cc
- --- a/components/password_manager/core/browser/password_form_manager.cc
- +++ b/components/password_manager/core/browser/password_form_manager.cc
- @@ -38,7 +38,6 @@
- #include "components/password_manager/core/browser/possible_username_data.h"
- #include "components/password_manager/core/browser/statistics_table.h"
- #include "components/password_manager/core/common/password_manager_features.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- #include "google_apis/gaia/core_account_id.h"
- #include "third_party/abseil-cpp/absl/types/variant.h"
-
- @@ -263,27 +262,7 @@ bool PasswordFormManager::WasUnblocklisted() const {
- }
-
- bool PasswordFormManager::IsMovableToAccountStore() const {
- - DCHECK(
- - client_->GetPasswordFeatureManager()->ShouldShowAccountStorageBubbleUi())
- - << "Ensure that the client supports moving passwords for this user!";
- - signin::IdentityManager* identity_manager = client_->GetIdentityManager();
- - DCHECK(identity_manager);
- - const std::string gaia_id =
- - identity_manager->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin)
- - .gaia;
- - DCHECK(!gaia_id.empty()) << "Cannot move without signed in user";
- -
- - const std::u16string& username = GetPendingCredentials().username_value;
- - const std::u16string& password = GetPendingCredentials().password_value;
- - // If no match in the profile store with the same username and password exist,
- - // then there is nothing to move.
- - auto is_movable = [&](const PasswordForm* match) {
- - return !match->IsUsingAccountStore() && match->username_value == username &&
- - match->password_value == password;
- - };
- - return base::ranges::any_of(form_fetcher_->GetBestMatches(), is_movable) &&
- - !form_fetcher_->IsMovingBlocked(GaiaIdHash::FromGaiaId(gaia_id),
- - username);
- + return false;
- }
-
- void PasswordFormManager::Save() {
- @@ -448,17 +427,6 @@ void PasswordFormManager::MoveCredentialsToAccountStore() {
- void PasswordFormManager::BlockMovingCredentialsToAccountStore() {
- // Nothing to do if there is no signed in user or the credentials are already
- // blocked for moving.
- - if (!IsMovableToAccountStore())
- - return;
- - const std::string gaia_id =
- - client_->GetIdentityManager()
- - ->GetPrimaryAccountInfo(signin::ConsentLevel::kSignin)
- - .gaia;
- - // The above call to IsMovableToAccountStore() guarantees there is a signed in
- - // user.
- - DCHECK(!gaia_id.empty());
- - password_save_manager_->BlockMovingToAccountStoreFor(
- - GaiaIdHash::FromGaiaId(gaia_id));
- }
-
- bool PasswordFormManager::IsNewLogin() const {
- diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
- --- a/components/password_manager/core/browser/password_manager.cc
- +++ b/components/password_manager/core/browser/password_manager.cc
- @@ -995,7 +995,6 @@ void PasswordManager::OnLoginSuccessful() {
- if (!client_->IsSavingAndFillingEnabled(submitted_form->url))
- return;
-
- - client_->GetStoreResultFilter()->ReportFormLoginSuccess(*submitted_manager);
- // Check for leaks only if there are no muted credentials.
- if (!HasMutedCredentials(
- submitted_manager->GetInsecureCredentials(),
- @@ -1019,22 +1018,6 @@ void PasswordManager::OnLoginSuccessful() {
-
- MaybeSavePasswordHash(submitted_manager);
-
- - // TODO(https://crbug.com/831123): Implement checking whether to save with
- - // PasswordFormManager.
- - // Check whether the filter allows saving this credential. In practice, this
- - // prevents saving the password of the syncing account. However, if the
- - // password is already saved, then *updating* it is still allowed - better
- - // than keeping an outdated password around.
- - if (!submitted_manager->IsPasswordUpdate() &&
- - !client_->GetStoreResultFilter()->ShouldSave(
- - *submitted_manager->GetSubmittedForm())) {
- - RecordProvisionalSaveFailure(
- - PasswordManagerMetricsRecorder::SYNC_CREDENTIAL,
- - submitted_manager->GetURL());
- - ResetSubmittedManager();
- - return;
- - }
- -
- submitted_manager->GetMetricsRecorder()->LogSubmitPassed();
-
- UMA_HISTOGRAM_BOOLEAN(
- @@ -1083,54 +1066,6 @@ void PasswordManager::MaybeSavePasswordHash(
- std::string username = base::UTF16ToUTF8(submitted_form->username_value);
- if (username.empty())
- return;
- -
- - password_manager::PasswordReuseManager* reuse_manager =
- - client_->GetPasswordReuseManager();
- - // May be null in tests.
- - if (!reuse_manager)
- - return;
- -
- - bool should_save_enterprise_pw =
- - client_->GetStoreResultFilter()->ShouldSaveEnterprisePasswordHash(
- - *submitted_form);
- - bool should_save_gaia_pw =
- - client_->GetStoreResultFilter()->ShouldSaveGaiaPasswordHash(
- - *submitted_form);
- -
- - if (!should_save_enterprise_pw && !should_save_gaia_pw)
- - return;
- -
- - if (password_manager_util::IsLoggingActive(client_)) {
- - BrowserSavePasswordProgressLogger logger(client_->GetLogManager());
- - logger.LogMessage(Logger::STRING_SAVE_PASSWORD_HASH);
- - }
- -
- - // Canonicalizes username if it is an email.
- - if (username.find('@') != std::string::npos)
- - username = gaia::CanonicalizeEmail(username);
- - bool is_password_change = !submitted_form->new_password_element.empty();
- - const std::u16string password = is_password_change
- - ? submitted_form->new_password_value
- - : submitted_form->password_value;
- -
- - if (should_save_enterprise_pw) {
- - reuse_manager->SaveEnterprisePasswordHash(username, password);
- - return;
- - }
- -
- - DCHECK(should_save_gaia_pw);
- - bool is_sync_account_email =
- - client_->GetStoreResultFilter()->IsSyncAccountEmail(username);
- - GaiaPasswordHashChange event =
- - is_sync_account_email
- - ? (is_password_change
- - ? GaiaPasswordHashChange::CHANGED_IN_CONTENT_AREA
- - : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA)
- - : (is_password_change
- - ? GaiaPasswordHashChange::NOT_SYNC_PASSWORD_CHANGE
- - : GaiaPasswordHashChange::SAVED_IN_CONTENT_AREA);
- - reuse_manager->SaveGaiaPasswordHash(username, password, is_sync_account_email,
- - event);
- }
-
- void PasswordManager::ProcessAutofillPredictions(
- @@ -1345,23 +1280,6 @@ void PasswordManager::ShowManualFallbackForSaving(
- ShouldBlockPasswordForSameOriginButDifferentScheme(form_data.url)) {
- return;
- }
- -
- - if (!client_->GetStoreResultFilter()->ShouldSave(
- - *form_manager->GetSubmittedForm())) {
- - return;
- - }
- -
- - // Show the fallback if a prompt or a confirmation bubble should be available.
- - bool has_generated_password = form_manager->HasGeneratedPassword();
- - if (ShouldPromptUserToSavePassword(*form_manager) || has_generated_password) {
- - bool is_update = form_manager->IsPasswordUpdate();
- - form_manager->GetMetricsRecorder()->RecordShowManualFallbackForSaving(
- - has_generated_password, is_update);
- - client_->ShowManualFallbackForSaving(form_manager->Clone(),
- - has_generated_password, is_update);
- - } else {
- - HideManualFallbackForSaving();
- - }
- }
-
- bool PasswordManager::NewFormsParsed(PasswordManagerDriver* driver,
- diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h
- --- a/components/password_manager/core/browser/password_manager_client.h
- +++ b/components/password_manager/core/browser/password_manager_client.h
- @@ -300,18 +300,12 @@ class PasswordManagerClient {
- // Gets prefs associated with this embedder.
- virtual PrefService* GetPrefs() const = 0;
-
- - // Gets the sync service associated with this client.
- - virtual const syncer::SyncService* GetSyncService() const = 0;
- -
- // Returns the profile PasswordStore associated with this instance.
- virtual PasswordStoreInterface* GetProfilePasswordStore() const = 0;
-
- // Returns the account PasswordStore associated with this instance.
- virtual PasswordStoreInterface* GetAccountPasswordStore() const = 0;
-
- - // Returns the PasswordReuseManager associated with this instance.
- - virtual PasswordReuseManager* GetPasswordReuseManager() const = 0;
- -
- // Returns the PasswordScriptsFetcher associated with this instance.
- virtual PasswordScriptsFetcher* GetPasswordScriptsFetcher() = 0;
-
- @@ -367,9 +361,6 @@ class PasswordManagerClient {
- // Returns last committed origin of the main frame.
- virtual url::Origin GetLastCommittedOrigin() const = 0;
-
- - // Use this to filter credentials before handling them in password manager.
- - virtual const CredentialsFilter* GetStoreResultFilter() const = 0;
- -
- // Returns a LogManager instance.
- virtual const autofill::LogManager* GetLogManager() const;
-
- @@ -398,14 +389,6 @@ class PasswordManagerClient {
- // The |username| is the user name of the reused password. The user name
- // can be an email or a username for a non-GAIA or saved-password reuse. No
- // validation has been done on it.
- - virtual void CheckProtectedPasswordEntry(
- - metrics_util::PasswordType reused_password_type,
- - const std::string& username,
- - const std::vector<MatchingReusedCredential>& matching_reused_credentials,
- - bool password_field_exists) = 0;
- -
- - // Records a Chrome Sync event that GAIA password reuse was detected.
- - virtual void LogPasswordReuseDetectedEvent() = 0;
-
- // If the feature is enabled send an event to the enterprise reporting
- // connector server indicating that the user signed in to a website.
- @@ -441,9 +424,6 @@ class PasswordManagerClient {
- // Returns the favicon service used to retrieve icons for an origin.
- virtual favicon::FaviconService* GetFaviconService();
-
- - // Returns the identity manager for profile.
- - virtual signin::IdentityManager* GetIdentityManager() = 0;
- -
- // Returns a pointer to the URLLoaderFactory owned by the storage partition of
- // the current profile.
- virtual scoped_refptr<network::SharedURLLoaderFactory>
- diff --git a/components/password_manager/core/browser/password_manager_client_helper.cc b/components/password_manager/core/browser/password_manager_client_helper.cc
- --- a/components/password_manager/core/browser/password_manager_client_helper.cc
- +++ b/components/password_manager/core/browser/password_manager_client_helper.cc
- @@ -13,29 +13,10 @@
- #include "components/password_manager/core/browser/password_sync_util.h"
- #include "components/password_manager/core/common/password_manager_pref_names.h"
- #include "components/prefs/pref_service.h"
- -#include "components/signin/public/identity_manager/account_info.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- #include "google_apis/gaia/gaia_auth_util.h"
-
- namespace password_manager {
-
- -namespace {
- -
- -constexpr int kMaxMoveToAccountOffersForNonOptedInUser = 5;
- -
- -bool IsPrimaryAccountSignIn(const signin::IdentityManager& identity_manager,
- - const std::u16string& username,
- - const std::string& signon_realm) {
- - CoreAccountInfo primary_account =
- - identity_manager.GetPrimaryAccountInfo(signin::ConsentLevel::kSignin);
- - return sync_util::IsGaiaCredentialPage(signon_realm) &&
- - !primary_account.IsEmpty() &&
- - gaia::AreEmailsSame(base::UTF16ToUTF8(username),
- - primary_account.email);
- -}
- -
- -} // namespace
- -
- PasswordManagerClientHelper::PasswordManagerClientHelper(
- PasswordManagerClient* delegate)
- : delegate_(delegate) {
- @@ -104,29 +85,7 @@ bool PasswordManagerClientHelper::ShouldPromptToEnableAutoSignIn() const {
-
- bool PasswordManagerClientHelper::ShouldPromptToMovePasswordToAccount(
- const PasswordFormManagerForUI& submitted_manager) const {
- - PasswordFeatureManager* feature_manager =
- - delegate_->GetPasswordFeatureManager();
- - if (!feature_manager->ShouldShowAccountStorageBubbleUi())
- - return false;
- - if (feature_manager->GetDefaultPasswordStore() ==
- - PasswordForm::Store::kProfileStore) {
- - return false;
- - }
- - if (!submitted_manager.IsMovableToAccountStore())
- - return false;
- - if (delegate_->IsIncognito())
- - return false;
- - // It's not useful to store the password for the primary account inside
- - // that same account.
- - if (IsPrimaryAccountSignIn(
- - *delegate_->GetIdentityManager(),
- - submitted_manager.GetPendingCredentials().username_value,
- - submitted_manager.GetPendingCredentials().signon_realm)) {
- - return false;
- - }
- - return feature_manager->IsOptedInForAccountStorage() ||
- - feature_manager->GetMoveOfferedToNonOptedInUserCount() <
- - kMaxMoveToAccountOffersForNonOptedInUser;
- + return false;
- }
-
- } // namespace password_manager
- diff --git a/components/password_manager/core/browser/sync_credentials_filter.cc b/components/password_manager/core/browser/sync_credentials_filter.cc
- --- a/components/password_manager/core/browser/sync_credentials_filter.cc
- +++ b/components/password_manager/core/browser/sync_credentials_filter.cc
- @@ -10,11 +10,7 @@
- #include "base/metrics/user_metrics.h"
- #include "components/password_manager/core/browser/password_form_manager.h"
- #include "components/password_manager/core/browser/password_manager_util.h"
- -#include "components/password_manager/core/browser/password_sync_util.h"
- #include "components/password_manager/core/common/password_manager_features.h"
- -#include "components/signin/public/identity_manager/account_info.h"
- -#include "components/signin/public/identity_manager/identity_manager.h"
- -#include "google_apis/gaia/gaia_auth_util.h"
-
- namespace password_manager {
-
- @@ -34,66 +30,26 @@ bool SyncCredentialsFilter::ShouldSave(const PasswordForm& form) const {
- if (form.form_data.is_gaia_with_skip_save_password_form)
- return false;
-
- - const syncer::SyncService* sync_service =
- - sync_service_factory_function_.Run();
- - const signin::IdentityManager* identity_manager =
- - client_->GetIdentityManager();
- -
- - if (base::FeatureList::IsEnabled(features::kEnablePasswordsAccountStorage)) {
- - // If kEnablePasswordsAccountStorage is enabled, then don't allow saving the
- - // password if it corresponds to the primary account. Note that if the user
- - // is just signing in to the first Gaia account, then IdentityManager might
- - // not know about the account yet.
- - if (sync_util::IsGaiaCredentialPage(form.signon_realm)) {
- - CoreAccountInfo primary_account = identity_manager->GetPrimaryAccountInfo(
- - signin::ConsentLevel::kSignin);
- - if (primary_account.IsEmpty() ||
- - gaia::AreEmailsSame(base::UTF16ToUTF8(form.username_value),
- - primary_account.email)) {
- - return false;
- - }
- - }
- - } else {
- - // If kEnablePasswordsAccountStorage is NOT enabled, then don't allow saving
- - // the password for the sync account specifically.
- - if (sync_util::IsSyncAccountCredential(form, sync_service,
- - identity_manager)) {
- - return false;
- - }
- - }
- -
- return true;
- }
-
- bool SyncCredentialsFilter::ShouldSaveGaiaPasswordHash(
- const PasswordForm& form) const {
- - if (base::FeatureList::IsEnabled(features::kPasswordReuseDetectionEnabled)) {
- - return !client_->IsIncognito() &&
- - sync_util::IsGaiaCredentialPage(form.signon_realm);
- - }
- return false;
- }
-
- bool SyncCredentialsFilter::ShouldSaveEnterprisePasswordHash(
- const PasswordForm& form) const {
- - return !client_->IsIncognito() && sync_util::ShouldSaveEnterprisePasswordHash(
- - form, *client_->GetPrefs());
- + return false;
- }
-
- bool SyncCredentialsFilter::IsSyncAccountEmail(
- const std::string& username) const {
- - return sync_util::IsSyncAccountEmail(username, client_->GetIdentityManager());
- + return false;
- }
-
- void SyncCredentialsFilter::ReportFormLoginSuccess(
- const PasswordFormManager& form_manager) const {
- - if (!form_manager.IsNewLogin() &&
- - sync_util::IsSyncAccountCredential(form_manager.GetPendingCredentials(),
- - sync_service_factory_function_.Run(),
- - client_->GetIdentityManager())) {
- - base::RecordAction(base::UserMetricsAction(
- - "PasswordManager_SyncCredentialFilledAndLoginSuccessfull"));
- - }
- }
-
- } // namespace password_manager
- diff --git a/components/signin/features.gni b/components/signin/features.gni
- --- a/components/signin/features.gni
- +++ b/components/signin/features.gni
- @@ -5,7 +5,7 @@
- import("//build/config/chromeos/ui_mode.gni")
-
- # Dice is supported on the platform (but not necessarily enabled).
- -enable_dice_support = is_linux || is_mac || is_win || is_fuchsia
- +enable_dice_support = false
-
- # Mirror is enabled and other account consistency mechanisms are not available.
- -enable_mirror = is_android || is_chromeos || is_ios
- +enable_mirror = false
- diff --git a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
- --- a/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
- +++ b/components/signin/public/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java
- @@ -130,13 +130,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
- }
-
- protected boolean hasFeatures(Account account, String[] features) {
- - if (hasGetAccountsPermission()) {
- - try {
- - return mAccountManager.hasFeatures(account, features, null, null).getResult();
- - } catch (AuthenticatorException | IOException | OperationCanceledException e) {
- - Log.e(TAG, "Error while checking features: ", e);
- - }
- - }
- return false;
- }
-
- @@ -177,25 +170,9 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
- public void updateCredentials(
- Account account, Activity activity, final Callback<Boolean> callback) {
- ThreadUtils.assertOnUiThread();
- - AccountManagerCallback<Bundle> realCallback = future -> {
- - Bundle bundle = null;
- - try {
- - bundle = future.getResult();
- - } catch (AuthenticatorException | IOException e) {
- - Log.e(TAG, "Error while update credentials: ", e);
- - } catch (OperationCanceledException e) {
- - Log.w(TAG, "Updating credentials was cancelled.");
- - }
- - boolean success =
- - bundle != null && bundle.getString(AccountManager.KEY_ACCOUNT_TYPE) != null;
- if (callback != null) {
- - callback.onResult(success);
- + callback.onResult(false);
- }
- - };
- - // Android 4.4 throws NullPointerException if null is passed
- - Bundle emptyOptions = new Bundle();
- - mAccountManager.updateCredentials(
- - account, "android", emptyOptions, activity, realCallback, null);
- }
-
- @Nullable
- diff --git a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
- --- a/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
- +++ b/net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java
- @@ -98,54 +98,8 @@ public class HttpNegotiateAuthenticator {
-
- @Override
- public void run(AccountManagerFuture<Account[]> future) {
- - Account[] accounts;
- - try {
- - accounts = future.getResult();
- - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
- - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to retrieve accounts.", e);
- - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
- - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
- - return;
- - }
- -
- - if (accounts.length == 0) {
- - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: No account provided for the kerberos "
- - + "authentication. Please verify the configuration policies and "
- - + "that the CONTACTS runtime permission is granted. ");
- - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
- - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
- - null);
- - return;
- - }
- -
- - if (accounts.length > 1) {
- - Log.w(TAG, "ERR_MISSING_AUTH_CREDENTIALS: Found %d accounts eligible for the "
- - + "kerberos authentication. Please fix the configuration by "
- - + "providing a single account.",
- - accounts.length);
- - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
- - HttpNegotiateAuthenticator.this, NetError.ERR_MISSING_AUTH_CREDENTIALS,
- - null);
- - return;
- - }
- -
- - if (lacksPermission(ContextUtils.getApplicationContext(),
- - "android.permission.USE_CREDENTIALS", true)) {
- - // Protecting the AccountManager#getAuthToken call.
- - // API < 23 Requires the USE_CREDENTIALS permission or throws an exception.
- - // API >= 23 USE_CREDENTIALS permission is removed
- - Log.e(TAG, "ERR_MISCONFIGURED_AUTH_ENVIRONMENT: USE_CREDENTIALS permission not "
- - + "granted. Aborting authentication.");
- - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
- - HttpNegotiateAuthenticator.this,
- - NetError.ERR_MISCONFIGURED_AUTH_ENVIRONMENT, null);
- - return;
- - }
- - mRequestData.account = accounts[0];
- - mRequestData.accountManager.getAuthToken(mRequestData.account,
- - mRequestData.authTokenType, mRequestData.options, true /* notifyAuthFailure */,
- - new GetTokenCallback(mRequestData),
- - new Handler(ThreadUtils.getUiThreadLooper()));
- + // account-based authentication removed for privacy-violations concerns
- + return;
- }
- }
-
- @@ -158,42 +112,8 @@ public class HttpNegotiateAuthenticator {
-
- @Override
- public void run(AccountManagerFuture<Bundle> future) {
- - Bundle result;
- - try {
- - result = future.getResult();
- - } catch (OperationCanceledException | AuthenticatorException | IOException e) {
- - Log.w(TAG, "ERR_UNEXPECTED: Error while attempting to obtain a token.", e);
- - HttpNegotiateAuthenticatorJni.get().setResult(mRequestData.nativeResultObject,
- - HttpNegotiateAuthenticator.this, NetError.ERR_UNEXPECTED, null);
- - return;
- - }
- -
- - if (result.containsKey(AccountManager.KEY_INTENT)) {
- - final Context appContext = ContextUtils.getApplicationContext();
- -
- - // We wait for a broadcast that should be sent once the user is done interacting
- - // with the notification
- - // TODO(dgn) We currently hang around if the notification is swiped away, until
- - // a LOGIN_ACCOUNTS_CHANGED_ACTION filter is received. It might be for something
- - // unrelated then we would wait again here. Maybe we should limit the number of
- - // retries in some way?
- - BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
- -
- - @Override
- - public void onReceive(Context context, Intent intent) {
- - appContext.unregisterReceiver(this);
- - mRequestData.accountManager.getAuthToken(mRequestData.account,
- - mRequestData.authTokenType, mRequestData.options,
- - true /* notifyAuthFailure */, new GetTokenCallback(mRequestData),
- - null);
- - }
- -
- - };
- - appContext.registerReceiver(broadcastReceiver,
- - new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION));
- - } else {
- - processResult(result, mRequestData);
- - }
- + // account-based authentication removed for privacy-violations concerns
- + return;
- }
- }
-
- diff --git a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
- --- a/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
- +++ b/remoting/android/java/src/org/chromium/chromoting/base/OAuthTokenFetcher.java
- @@ -93,7 +93,6 @@ public class OAuthTokenFetcher {
-
- /** Begins fetching a token. Should be called on the main thread. */
- public void fetch() {
- - fetchImpl(null);
- }
-
- /**
- @@ -102,7 +101,6 @@ public class OAuthTokenFetcher {
- * @param expiredToken A previously-fetched token which has expired.
- */
- public void clearAndFetch(String expiredToken) {
- - fetchImpl(expiredToken);
- }
-
- private void fetchImpl(final String expiredToken) {
- --
- 2.25.1
|