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

Side by Side Diff: chrome/browser/search_engines/template_url_prepopulate_data.cc

Issue 10695115: Add a separate protector UMA state when backup is overwritten by migration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
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 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 5 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <locale.h> 8 #include <locale.h>
9 #endif 9 #endif
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 // This ID must be "unique" within one country's prepopulated data, but two 65 // This ID must be "unique" within one country's prepopulated data, but two
66 // entries can share an ID if they represent the "same" engine (e.g. Yahoo! US 66 // entries can share an ID if they represent the "same" engine (e.g. Yahoo! US
67 // vs. Yahoo! UK) and will not appear in the same user-visible data set. This 67 // vs. Yahoo! UK) and will not appear in the same user-visible data set. This
68 // facilitates changes like adding more specific per-country data in the 68 // facilitates changes like adding more specific per-country data in the
69 // future; in such a case the localized engines will transparently replace the 69 // future; in such a case the localized engines will transparently replace the
70 // previous, non-localized versions. For engines where we need two instances 70 // previous, non-localized versions. For engines where we need two instances
71 // to appear for one country (e.g. Bing Search U.S. English and Spanish), we 71 // to appear for one country (e.g. Bing Search U.S. English and Spanish), we
72 // must use two different unique IDs (and different keywords). 72 // must use two different unique IDs (and different keywords).
73 // 73 //
74 // The following unique IDs are available: 74 // The following unique IDs are available:
75 // 50, 52, 53, 56, 58, 60, 61, 64, 65, 66, 70, 74, 78, 79, 80, 81, 84, 86, 75 // 53, 56, 58, 60, 61, 64, 65, 66, 70, 74, 78, 79, 80, 81, 84, 86, 88, 91,
76 // 88, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102+ 76 // 92, 93, 94, 95, 96, 97, 98, 99, 102+
77 // 77 //
78 // IDs > 1000 are reserved for distribution custom engines. 78 // IDs > 1000 are reserved for distribution custom engines.
79 // 79 //
80 // NOTES: 80 // NOTES:
81 // CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad! 81 // CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
82 // CHANGE kMaxPrepopulatedEngineID below if you add new engine outside 82 // CHANGE kMaxPrepopulatedEngineID below if you add new engine outside
83 // of the current range or it will not be counted in stats. 83 // of the current range or it will not be counted in stats.
84 const int id; 84 const int id;
85 }; 85 };
86 86
(...skipping 2039 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 L"aport.ru", 2126 L"aport.ru",
2127 NULL, 2127 NULL,
2128 "http://www.aport.ru/search/?r={searchTerms}", 2128 "http://www.aport.ru/search/?r={searchTerms}",
2129 "UTF-8", 2129 "UTF-8",
2130 NULL, 2130 NULL,
2131 NULL, 2131 NULL,
2132 SEARCH_ENGINE_APORT, 2132 SEARCH_ENGINE_APORT,
2133 34, 2133 34,
2134 }; 2134 };
2135 2135
2136 const PrepopulatedEngine avg = {
2137 L"AVG Secure Search",
2138 L"search.avg.com",
2139 NULL,
2140 "http://search.avg.com/route/?q={searchTerms}&lng={language}",
2141 "UTF-8",
2142 NULL,
2143 NULL,
2144 SEARCH_ENGINE_AVG,
2145 50,
2146 };
2147
2148 const PrepopulatedEngine avg_i = {
2149 L"AVG Secure Search",
2150 L"isearch.avg.com",
2151 NULL,
2152 "http://isearch.avg.com/search?q={searchTerms}&lng={language}",
2153 "UTF-8",
2154 NULL,
2155 NULL,
2156 SEARCH_ENGINE_AVG,
2157 52,
2158 };
2159
2136 const PrepopulatedEngine conduit = { 2160 const PrepopulatedEngine conduit = {
2137 L"Conduit", 2161 L"Conduit",
2138 L"conduit.com", 2162 L"conduit.com",
2139 NULL, 2163 NULL,
2140 "http://search.conduit.com/Results.aspx?q={searchTerms}", 2164 "http://search.conduit.com/Results.aspx?q={searchTerms}",
2141 "UTF-8", 2165 "UTF-8",
2142 NULL, 2166 NULL,
2143 NULL, 2167 NULL,
2144 SEARCH_ENGINE_CONDUIT, 2168 SEARCH_ENGINE_CONDUIT,
2145 36, 2169 36,
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
2704 &rednano, &sanook, &sapo, &search_de_CH, &search_fr_CH, &seznam, 2728 &rednano, &sanook, &sapo, &search_de_CH, &search_fr_CH, &seznam,
2705 &terra_ar, &terra_es, &tut, &uol, &virgilio, &walla, &wp, &yahoo, 2729 &terra_ar, &terra_es, &tut, &uol, &virgilio, &walla, &wp, &yahoo,
2706 &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch, 2730 &yahoo_ar, &yahoo_at, &yahoo_au, &yahoo_br, &yahoo_ca, &yahoo_ch,
2707 &yahoo_cl, &yahoo_cn, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es, 2731 &yahoo_cl, &yahoo_cn, &yahoo_co, &yahoo_de, &yahoo_dk, &yahoo_es,
2708 &yahoo_fi, &yahoo_fr, &yahoo_hk, &yahoo_id, &yahoo_in, &yahoo_it, 2732 &yahoo_fi, &yahoo_fr, &yahoo_hk, &yahoo_id, &yahoo_in, &yahoo_it,
2709 &yahoo_jp, &yahoo_kr, &yahoo_malaysia, &yahoo_mx, &yahoo_nl, &yahoo_no, 2733 &yahoo_jp, &yahoo_kr, &yahoo_malaysia, &yahoo_mx, &yahoo_nl, &yahoo_no,
2710 &yahoo_nz, &yahoo_pe, &yahoo_ph, &yahoo_qc, &yahoo_ru, &yahoo_se, 2734 &yahoo_nz, &yahoo_pe, &yahoo_ph, &yahoo_qc, &yahoo_ru, &yahoo_se,
2711 &yahoo_sg, &yahoo_th, &yahoo_tw, &yahoo_uk, &yahoo_ve, &yahoo_vn, &yamli, 2735 &yahoo_sg, &yahoo_th, &yahoo_tw, &yahoo_uk, &yahoo_ve, &yahoo_vn, &yamli,
2712 &yandex_ru, &yandex_ua, &zoznam, 2736 &yandex_ru, &yandex_ua, &zoznam,
2713 // UMA-only engines: 2737 // UMA-only engines:
2714 &all_by, &aport, &conduit, &icq, &meta_ua, &metabot_ru, &nigma, &qip, 2738 &all_by, &aport, &avg, &avg_i, &conduit, &icq, &meta_ua, &metabot_ru,
2715 &ukr_net, &webalta, &yandex_tr }; 2739 &nigma, &qip, &ukr_net, &webalta, &yandex_tr };
2716 2740
2717 2741
2718 // Geographic mappings ///////////////////////////////////////////////////////// 2742 // Geographic mappings /////////////////////////////////////////////////////////
2719 2743
2720 // Please refer to ISO 3166-1 for information about the two-character country 2744 // Please refer to ISO 3166-1 for information about the two-character country
2721 // codes; http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 is useful. In the 2745 // codes; http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 is useful. In the
2722 // following (C++) code, we pack the two letters of the country code into an int 2746 // following (C++) code, we pack the two letters of the country code into an int
2723 // value we call the CountryID. 2747 // value we call the CountryID.
2724 2748
2725 const int kCountryIDUnknown = -1; 2749 const int kCountryIDUnknown = -1;
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
3455 g_country_code_at_install = kCountryIDUnknown; 3479 g_country_code_at_install = kCountryIDUnknown;
3456 } else { 3480 } else {
3457 g_country_code_at_install = 3481 g_country_code_at_install =
3458 CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]); 3482 CountryCharsToCountryIDWithUpdate(country_code[0], country_code[1]);
3459 } 3483 }
3460 } 3484 }
3461 3485
3462 #endif 3486 #endif
3463 3487
3464 } // namespace TemplateURLPrepopulateData 3488 } // namespace TemplateURLPrepopulateData
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/search_engine_type.h ('k') | chrome/browser/webdata/keyword_table.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698