| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_model.h" | 5 #include "chrome/browser/search_engines/template_url_model.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 821 | 821 |
| 822 std::wstring name = prefs->GetString(prefs::kDefaultSearchProviderName); | 822 std::wstring name = prefs->GetString(prefs::kDefaultSearchProviderName); |
| 823 | 823 |
| 824 std::wstring id_string = prefs->GetString(prefs::kDefaultSearchProviderID); | 824 std::wstring id_string = prefs->GetString(prefs::kDefaultSearchProviderID); |
| 825 | 825 |
| 826 *default_provider = new TemplateURL(); | 826 *default_provider = new TemplateURL(); |
| 827 (*default_provider)->set_short_name(name); | 827 (*default_provider)->set_short_name(name); |
| 828 (*default_provider)->SetURL(search_url, 0, 0); | 828 (*default_provider)->SetURL(search_url, 0, 0); |
| 829 (*default_provider)->SetSuggestionsURL(suggest_url, 0, 0); | 829 (*default_provider)->SetSuggestionsURL(suggest_url, 0, 0); |
| 830 if (!id_string.empty()) | 830 if (!id_string.empty()) |
| 831 (*default_provider)->set_id(StringToInt64(id_string)); | 831 (*default_provider)->set_id(StringToInt64(WideToUTF16Hack(id_string))); |
| 832 return true; | 832 return true; |
| 833 } | 833 } |
| 834 | 834 |
| 835 void TemplateURLModel::RegisterPrefs(PrefService* prefs) { | 835 void TemplateURLModel::RegisterPrefs(PrefService* prefs) { |
| 836 if (prefs->IsPrefRegistered(prefs::kDefaultSearchProviderName)) | 836 if (prefs->IsPrefRegistered(prefs::kDefaultSearchProviderName)) |
| 837 return; | 837 return; |
| 838 prefs->RegisterStringPref( | 838 prefs->RegisterStringPref( |
| 839 prefs::kDefaultSearchProviderName, std::wstring()); | 839 prefs::kDefaultSearchProviderName, std::wstring()); |
| 840 prefs->RegisterStringPref( | 840 prefs->RegisterStringPref( |
| 841 prefs::kDefaultSearchProviderID, std::wstring()); | 841 prefs::kDefaultSearchProviderID, std::wstring()); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 AddToMaps(t_url); | 974 AddToMaps(t_url); |
| 975 something_changed = true; | 975 something_changed = true; |
| 976 } | 976 } |
| 977 } | 977 } |
| 978 | 978 |
| 979 if (something_changed && loaded_) { | 979 if (something_changed && loaded_) { |
| 980 FOR_EACH_OBSERVER(TemplateURLModelObserver, model_observers_, | 980 FOR_EACH_OBSERVER(TemplateURLModelObserver, model_observers_, |
| 981 OnTemplateURLModelChanged()); | 981 OnTemplateURLModelChanged()); |
| 982 } | 982 } |
| 983 } | 983 } |
| OLD | NEW |