]>
Commit | Line | Data |
---|---|---|
796610d1 ER |
1 | --- chromium-browser-7.0.510.0~svn20100831r57933/src/chrome/browser/search_engines/template_url.cc~ 2010-08-31 17:24:46.000000000 +0300 |
2 | +++ chromium-browser-7.0.510.0~svn20100831r57933/src/chrome/browser/search_engines/template_url.cc 2010-09-01 22:28:29.663788855 +0300 | |
3 | @@ -337,27 +337,28 @@ | |
7b454a31 AM |
4 | i != replacements_.rend(); ++i) { |
5 | switch (i->type) { | |
6 | case ENCODING: | |
7 | - url.insert(i->index, input_encoding); | |
8 | + /* Temporary workaround according to http://crbug.com/41887 */ | |
9 | + url.replace(i->index, 0, input_encoding); | |
10 | break; | |
11 | ||
12 | case GOOGLE_ACCEPTED_SUGGESTION: | |
13 | if (accepted_suggestion == NO_SUGGESTION_CHOSEN) | |
97fac491 ER |
14 | - url.insert(i->index, "aq=f&"); |
15 | + url.replace(i->index, 0, "aq=f&"); | |
7b454a31 | 16 | else if (accepted_suggestion != NO_SUGGESTIONS_AVAILABLE) |
97fac491 ER |
17 | - url.insert(i->index, StringPrintf("aq=%d&", accepted_suggestion)); |
18 | + url.replace(i->index, 0, StringPrintf("aq=%d&", accepted_suggestion)); | |
7b454a31 AM |
19 | break; |
20 | ||
21 | case GOOGLE_BASE_URL: | |
796610d1 ER |
22 | - url.insert(i->index, search_terms_data.GoogleBaseURLValue()); |
23 | + url.replace(i->index, 0, search_terms_data.GoogleBaseURLValue()); | |
7b454a31 AM |
24 | break; |
25 | ||
26 | case GOOGLE_BASE_SUGGEST_URL: | |
796610d1 ER |
27 | - url.insert(i->index, search_terms_data.GoogleBaseSuggestURLValue()); |
28 | + url.replace(i->index, 0, search_terms_data.GoogleBaseSuggestURLValue()); | |
7b454a31 AM |
29 | break; |
30 | ||
31 | case GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION: | |
32 | if (accepted_suggestion >= 0) | |
97fac491 ER |
33 | - url.insert(i->index, "oq=" + UTF16ToUTF8(encoded_original_query) + |
34 | + url.replace(i->index, 0, "oq=" +UTF16ToUTF8(encoded_original_query) + | |
35 | "&"); | |
7b454a31 AM |
36 | break; |
37 | ||
796610d1 | 38 | @@ -381,17 +382,17 @@ |
97fac491 | 39 | base::WideToCodepage(terms, input_encoding.c_str(), |
7b454a31 AM |
40 | base::OnStringConversionError::SKIP, |
41 | &unescaped_terms); | |
97fac491 ER |
42 | - url.insert(i->index, std::string(unescaped_terms.begin(), |
43 | + url.replace(i->index, 0, std::string(unescaped_terms.begin(), | |
44 | unescaped_terms.end())); | |
7b454a31 AM |
45 | break; |
46 | } | |
47 | ||
48 | case LANGUAGE: | |
796610d1 ER |
49 | - url.insert(i->index, search_terms_data.GetApplicationLocale()); |
50 | + url.replace(i->index, 0, search_terms_data.GetApplicationLocale()); | |
7b454a31 AM |
51 | break; |
52 | ||
53 | case SEARCH_TERMS: | |
97fac491 ER |
54 | - url.insert(i->index, UTF16ToUTF8(encoded_terms)); |
55 | + url.replace(i->index, 0, UTF16ToUTF8(encoded_terms)); | |
7b454a31 AM |
56 | break; |
57 | ||
58 | default: |