Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(599)

Side by Side Diff: chrome/browser/search_engines/prepopulated_engines.json

Issue 22532013: Fix search-by-image regression. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: .. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file is used during build to generate prepopulated_engine.h/cc. 5 // This file is used during build to generate prepopulated_engine.h/cc.
6 // For more details see tools/json_to_struct/json_to_struct.py. 6 // For more details see tools/json_to_struct/json_to_struct.py.
7 7
8 // Engine definitions. See prepopulated_engines_schema.json for the field 8 // Engine definitions. See prepopulated_engines_schema.json for the field
9 // definitions. 9 // definitions.
10 10
11 // The following unique IDs are available: 11 // The following unique IDs are available:
12 // 11, 12, 14, 18, 19, 20, 22, 24, 26, 28, 29, 30, 32, 33, 34, 39, 37, 38, 12 // 11, 12, 14, 18, 19, 20, 22, 24, 26, 28, 29, 30, 32, 33, 34, 39, 37, 38,
13 // 40, 41, 42, 46, 47, 48, 49, 51, 52, 59, 71, 72, 82, 84, 86, 88, 89, 91+ 13 // 40, 41, 42, 46, 47, 48, 49, 51, 52, 59, 71, 72, 82, 84, 86, 88, 89, 91+
14 // 14 //
15 // IDs > 1000 are reserved for distribution custom engines. 15 // IDs > 1000 are reserved for distribution custom engines.
16 // 16 //
17 // NOTES: 17 // NOTES:
18 // - CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad! 18 // - CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
19 // - Make sure you update the int_variables below as required. 19 // - Make sure you update the int_variables below as required.
20 20
21 { 21 {
22 "int_variables": { 22 "int_variables": {
23 // The following id is for UMA stats only. Please update it if you add new 23 // The following id is for UMA stats only. Please update it if you add new
24 // engines outside the current range or it will not be counted in stats. 24 // engines outside the current range or it will not be counted in stats.
25 "kMaxPrepopulatedEngineID": 90, 25 "kMaxPrepopulatedEngineID": 90,
26 26
27 // Increment this if you change the data in ways that mean users with 27 // Increment this if you change the data in ways that mean users with
28 // existing data should get a new version. 28 // existing data should get a new version.
29 "kCurrentDataVersion": 60 29 "kCurrentDataVersion": 61
30 }, 30 },
31 31
32 // The following engines are included in country lists and are added to the 32 // The following engines are included in country lists and are added to the
33 // list of search engines on the first run depending on user's country. 33 // list of search engines on the first run depending on user's country.
34 "elements": { 34 "elements": {
35 "aol": { 35 "aol": {
36 "name": "AOL", 36 "name": "AOL",
37 "keyword": "aol.com", 37 "keyword": "aol.com",
38 "favicon_url": "http://search.aol.com/favicon.ico", 38 "favicon_url": "http://search.aol.com/favicon.ico",
39 "search_url": "http://search.aol.com/aol/search?query={searchTerms}", 39 "search_url": "http://search.aol.com/aol/search?query={searchTerms}",
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 }, 483 },
484 484
485 "google": { 485 "google": {
486 "name": "Google", 486 "name": "Google",
487 "keyword": "google.com", 487 "keyword": "google.com",
488 "favicon_url": "http://www.google.com/favicon.ico", 488 "favicon_url": "http://www.google.com/favicon.ico",
489 "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google: originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialPa rameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledPara meter}{google:omniboxStartMarginParameter}ie={inputEncoding}", 489 "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google: originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialPa rameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledPara meter}{google:omniboxStartMarginParameter}ie={inputEncoding}",
490 "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialPara meter}client={google:suggestClient}&q={searchTerms}&{google:cursorPosition}{goog le:zeroPrefixUrl}{google:pageClassification}sugkey={google:suggestAPIKeyParamete r}", 490 "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialPara meter}client={google:suggestClient}&q={searchTerms}&{google:cursorPosition}{goog le:zeroPrefixUrl}{google:pageClassification}sugkey={google:suggestAPIKeyParamete r}",
491 "instant_url": "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ} {google:instantEnabledParameter}{google:instantExtendedEnabledParameter}{google: ntpIsThemedParameter}{google:omniboxStartMarginParameter}ie={inputEncoding}", 491 "instant_url": "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ} {google:instantEnabledParameter}{google:instantExtendedEnabledParameter}{google: ntpIsThemedParameter}{google:omniboxStartMarginParameter}ie={inputEncoding}",
492 "image_url": "{google:baseURL}searchbyimage/upload", 492 "image_url": "{google:baseURL}searchbyimage/upload",
493 "image_url_post_params": "image_content={google:imageThumbnail},image_url= {google:imageURL},sbisrc={google:imageSearchSource}", 493 "image_url_post_params": "encoded_image={google:imageThumbnail},image_url= {google:imageURL},sbisrc={google:imageSearchSource}",
494 "alternate_urls": [ 494 "alternate_urls": [
495 "{google:baseURL}#q={searchTerms}", 495 "{google:baseURL}#q={searchTerms}",
496 "{google:baseURL}search#q={searchTerms}", 496 "{google:baseURL}search#q={searchTerms}",
497 "{google:baseURL}webhp#q={searchTerms}" 497 "{google:baseURL}webhp#q={searchTerms}"
498 ], 498 ],
499 "search_terms_replacement_key": "{google:instantExtendedEnabledKey}", 499 "search_terms_replacement_key": "{google:instantExtendedEnabledKey}",
500 "type": "SEARCH_ENGINE_GOOGLE", 500 "type": "SEARCH_ENGINE_GOOGLE",
501 "id": 1 501 "id": 1
502 }, 502 },
503 503
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
1387 "name": "Zoznam", 1387 "name": "Zoznam",
1388 "keyword": "zoznam.sk", 1388 "keyword": "zoznam.sk",
1389 "favicon_url": "http://www.zoznam.sk/favicon.ico", 1389 "favicon_url": "http://www.zoznam.sk/favicon.ico",
1390 "search_url": "http://www.zoznam.sk/hladaj.fcgi?s={searchTerms}", 1390 "search_url": "http://www.zoznam.sk/hladaj.fcgi?s={searchTerms}",
1391 "encoding": "windows-1250", 1391 "encoding": "windows-1250",
1392 "type": "SEARCH_ENGINE_ZOZNAM", 1392 "type": "SEARCH_ENGINE_ZOZNAM",
1393 "id": 85 1393 "id": 85
1394 } 1394 }
1395 } 1395 }
1396 } 1396 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698