View | Details | Raw Unified | Return to bug 45191
Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +17 lines)
Line  Link Here
0 
-- a/components/search_engines/prepopulated_engines.json
 0 
++ b/components/search_engines/prepopulated_engines.json
Lines 552-558 Link Here
552 
      "keyword": "yandex.by",
 552 
      "keyword": "yandex.by",
553 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
 553 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
554 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
 554 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
555 
      "search_url": "https://yandex.by/{yandex:searchPath}?text={searchTerms}",
 555 
      "search_url": "https://yandex.by/{yandex:searchPath}?text={searchTerms}&from=altos&{yandex:referralID}",
556 
      "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
 556 
      "suggest_url": "https://suggest.yandex.by/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
557 
      "image_url": "https://yandex.by/images/search/?rpt=imageview",
 557 
      "image_url": "https://yandex.by/images/search/?rpt=imageview",
558 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 558 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
Lines 565-571 Link Here
565 
      "name": "Yandex",
 565 
      "name": "Yandex",
566 
      "keyword": "yandex.com",
 566 
      "keyword": "yandex.com",
567 
      "favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
 567 
      "favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
568 
      "search_url": "https://yandex.com/search/?text={searchTerms}&from=os&clid=1836588",
 568 
      "search_url": "https://yandex.com/search/?text={searchTerms}&from=altos&{yandex:referralID}",
569 
      "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
 569 
      "suggest_url": "https://suggest.yandex.com/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}&uil=en&v=3&sn=5",
570 
      "image_url": "https://yandex.com/images/search?rpt=imageview",
 570 
      "image_url": "https://yandex.com/images/search?rpt=imageview",
571 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 571 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
Lines 578-584 Link Here
578 
      "keyword": "yandex.kz",
 578 
      "keyword": "yandex.kz",
579 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
 579 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
580 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
 580 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
581 
      "search_url": "https://yandex.kz/{yandex:searchPath}?text={searchTerms}",
 581 
      "search_url": "https://yandex.kz/{yandex:searchPath}?text={searchTerms}&from=altos&{yandex:referralID}",
582 
      "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
 582 
      "suggest_url": "https://suggest.yandex.kz/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
583 
      "image_url": "https://yandex.kz/images/search/?rpt=imageview",
 583 
      "image_url": "https://yandex.kz/images/search/?rpt=imageview",
584 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 584 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
Lines 592-598 Link Here
592 
      "keyword": "yandex.ru",
 592 
      "keyword": "yandex.ru",
593 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
 593 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
594 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
 594 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
595 
      "search_url": "https://yandex.ru/{yandex:searchPath}?text={searchTerms}&{yandex:referralID}",
 595 
      "search_url": "https://yandex.ru/{yandex:searchPath}?text={searchTerms}&from=altos&{yandex:referralID}",
596 
      "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
 596 
      "suggest_url": "https://suggest.yandex.ru/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
597 
      "image_url": "https://yandex.ru/images/search/?rpt=imageview",
 597 
      "image_url": "https://yandex.ru/images/search/?rpt=imageview",
598 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 598 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
Lines 605-611 Link Here
605 
      "name": "Yandex",
 605 
      "name": "Yandex",
606 
      "keyword": "yandex.com.tr",
 606 
      "keyword": "yandex.com.tr",
607 
      "favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
 607 
      "favicon_url": "https://yastatic.net/lego/_/rBTjd6UOPk5913OSn5ZQVYMTQWQ.ico",
608 
      "search_url": "https://www.yandex.com.tr/{yandex:searchPath}?text={searchTerms}",
 608 
      "search_url": "https://www.yandex.com.tr/{yandex:searchPath}?text={searchTerms}&from=altos&{yandex:referralID}",
609 
      "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
 609 
      "suggest_url": "https://suggest.yandex.com.tr/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
610 
      "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
 610 
      "image_url": "https://yandex.com.tr/gorsel/search?rpt=imageview",
611 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 611 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
Lines 619-625 Link Here
619 
      "keyword": "yandex.ua",
 619 
      "keyword": "yandex.ua",
620 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
 620 
      "favicon_url": "https://yastatic.net/lego/_/pDu9OWAQKB0s2J9IojKpiS_Eho.ico",
621 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
 621 
      "logo_url": "https://storage.ape.yandex.net/get/browser/Doodles/yandex/drawable-xxhdpi/yandex.png",
622 
      "search_url": "https://yandex.ua/{yandex:searchPath}?text={searchTerms}",
 622 
      "search_url": "https://yandex.ua/{yandex:searchPath}?text={searchTerms}&from=altos&{yandex:referralID}",
623 
      "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
 623 
      "suggest_url": "https://suggest.yandex.ua/suggest-ff.cgi?part={searchTerms}&{google:cursorPosition}",
624 
      "image_url": "https://yandex.ua/images/search/?rpt=imageview",
 624 
      "image_url": "https://yandex.ua/images/search/?rpt=imageview",
625 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
 625 
      "image_url_post_params": "upfile={google:imageThumbnail},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight},prg=1",
626 
-- a/components/search_engines/search_terms_data.cc
 626 
++ b/components/search_engines/search_terms_data.cc
Lines 164-170 std::string SearchTermsData::GoogleImageSearchSource() const { Link Here
164 
}
 164 
}
165 

          165
          

        

        

          166
          
std::string SearchTermsData::GetYandexReferralID() const {

          166
          
std::string SearchTermsData::GetYandexReferralID() const {

        

          
            

              167
              
  return std::string();


              167
              
  return "2746753";

            

        

          168
          
}

          168
          
}

        

        

          169
          

          169
          

        

        

          170
          
std::string SearchTermsData::GetMailRUReferralID() const {

          170
          
std::string SearchTermsData::GetMailRUReferralID() const {

        

          
            

              171
              
-- a/components/search_engines/template_url_prepopulate_data.cc


              171
              
++ b/components/search_engines/template_url_prepopulate_data.cc

            

  

    
      
            Lines 1331-1336
          std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulationSetFromCountryID(
      
      
        Link Here
      
    
  

        

          1331
          
  std::vector<std::unique_ptr<TemplateURLData>> t_urls;

          1331
          
  std::vector<std::unique_ptr<TemplateURLData>> t_urls;

        

        

          1332
          
  for (size_t i = 0; i < num_engines; ++i)

          1332
          
  for (size_t i = 0; i < num_engines; ++i)

        

        

          1333
          
    t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i]));

          1333
          
    t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(*engines[i]));

        

            

              
              
              1334
              

            

            

              1335
              
  const auto itr =

            

            

              1336
              
        base::ranges::find(t_urls, yandex_ru.id, &TemplateURLData::prepopulate_id);

            

            

              1337
              
  if (itr == t_urls.end()) {

            

            

              1338
              
    t_urls.push_back(TemplateURLDataFromPrepopulatedEngine(yandex_com));

            

            

              1339
              
  }

            

        

          1334
          
  return t_urls;

          1340
          
  return t_urls;

        

        

          1335
          
}

          1341
          
}

        

        

          1336
          

          1342
          

        

  

    
      
            Lines 1383-1389
          std::vector<std::unique_ptr<TemplateURLData>> GetPrepopulatedEngines(
      
      
        Link Here
      
    
  

        

          1383
          
  }

          1389
          
  }

        

        

          1384
          
  if (default_search_provider_index) {

          1390
          
  if (default_search_provider_index) {

        

        

          1385
          
    const auto itr =

          1391
          
    const auto itr =

        

          
            

              1386
              
        base::ranges::find(t_urls, google.id, &TemplateURLData::prepopulate_id);


              1392
              
        base::ranges::find(t_urls, yandex_ru.id, &TemplateURLData::prepopulate_id);

            

        

          1387
          
    *default_search_provider_index =

          1393
          
    *default_search_provider_index =

        

        

          1388
          
        itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr);

          1394
          
        itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr);

        

        

          1389
          
  }

          1395
          
  }

        

            

              1390
              
- 

              
              
            






  

  Return to bug 45191