Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 // They need to know the mapping between an engine's "id" and its URLs. | 23 // They need to know the mapping between an engine's "id" and its URLs. |
| 24 | 24 |
| 25 { | 25 { |
| 26 "int_variables": { | 26 "int_variables": { |
| 27 // The following id is for UMA stats only. Please update it if you add new | 27 // The following id is for UMA stats only. Please update it if you add new |
| 28 // engines outside the current range or it will not be counted in stats. | 28 // engines outside the current range or it will not be counted in stats. |
| 29 "kMaxPrepopulatedEngineID": 90, | 29 "kMaxPrepopulatedEngineID": 90, |
| 30 | 30 |
| 31 // Increment this if you change the data in ways that mean users with | 31 // Increment this if you change the data in ways that mean users with |
| 32 // existing data should get a new version. | 32 // existing data should get a new version. |
| 33 "kCurrentDataVersion": 91 | 33 "kCurrentDataVersion": 90 |
|
Alexander Yashkin
2016/06/15 06:55:23
kCurrentDataVersion becomes 90 with previous versi
|
Peter Kasting
2016/06/15 09:18:12
Yeah, this is some kind of bad merge conflict reso
|
| 34 }, | 34 }, |
| 35 | 35 |
| 36 // The following engines are included in country lists and are added to the | 36 // The following engines are included in country lists and are added to the |
| 37 // list of search engines on the first run depending on user's country. | 37 // list of search engines on the first run depending on user's country. |
| 38 "elements": { | 38 "elements": { |
| 39 "aol": { | 39 "aol": { |
| 40 "name": "AOL", | 40 "name": "AOL", |
| 41 "keyword": "aol.com", | 41 "keyword": "aol.com", |
| 42 "favicon_url": "http://search.aol.com/favicon.ico", | 42 "favicon_url": "http://search.aol.com/favicon.ico", |
| 43 "search_url": "http://search.aol.com/aol/search?q={searchTerms}", | 43 "search_url": "http://search.aol.com/aol/search?q={searchTerms}", |
| (...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 996 "name": "Zoznam", | 996 "name": "Zoznam", |
| 997 "keyword": "zoznam.sk", | 997 "keyword": "zoznam.sk", |
| 998 "favicon_url": "http://www.zoznam.sk/favicon.ico", | 998 "favicon_url": "http://www.zoznam.sk/favicon.ico", |
| 999 "search_url": "http://www.zoznam.sk/hladaj.fcgi?s={searchTerms}", | 999 "search_url": "http://www.zoznam.sk/hladaj.fcgi?s={searchTerms}", |
| 1000 "encoding": "windows-1250", | 1000 "encoding": "windows-1250", |
| 1001 "type": "SEARCH_ENGINE_ZOZNAM", | 1001 "type": "SEARCH_ENGINE_ZOZNAM", |
| 1002 "id": 85 | 1002 "id": 85 |
| 1003 } | 1003 } |
| 1004 } | 1004 } |
| 1005 } | 1005 } |
| OLD | NEW |