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

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

Issue 8198007: Remove PrefService::ScheduleSavePersistentPrefs and SavePersistentPrefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 8 years, 12 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/sync/signin_manager.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_service.h" 5 #include "chrome/browser/search_engines/template_url_service.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/i18n/case_conversion.h" 10 #include "base/i18n/case_conversion.h"
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 prefs->SetBoolean(prefs::kDefaultSearchProviderEnabled, enabled); 1207 prefs->SetBoolean(prefs::kDefaultSearchProviderEnabled, enabled);
1208 prefs->SetString(prefs::kDefaultSearchProviderSearchURL, search_url); 1208 prefs->SetString(prefs::kDefaultSearchProviderSearchURL, search_url);
1209 prefs->SetString(prefs::kDefaultSearchProviderSuggestURL, suggest_url); 1209 prefs->SetString(prefs::kDefaultSearchProviderSuggestURL, suggest_url);
1210 prefs->SetString(prefs::kDefaultSearchProviderInstantURL, instant_url); 1210 prefs->SetString(prefs::kDefaultSearchProviderInstantURL, instant_url);
1211 prefs->SetString(prefs::kDefaultSearchProviderIconURL, icon_url); 1211 prefs->SetString(prefs::kDefaultSearchProviderIconURL, icon_url);
1212 prefs->SetString(prefs::kDefaultSearchProviderEncodings, encodings); 1212 prefs->SetString(prefs::kDefaultSearchProviderEncodings, encodings);
1213 prefs->SetString(prefs::kDefaultSearchProviderName, short_name); 1213 prefs->SetString(prefs::kDefaultSearchProviderName, short_name);
1214 prefs->SetString(prefs::kDefaultSearchProviderKeyword, keyword); 1214 prefs->SetString(prefs::kDefaultSearchProviderKeyword, keyword);
1215 prefs->SetString(prefs::kDefaultSearchProviderID, id_string); 1215 prefs->SetString(prefs::kDefaultSearchProviderID, id_string);
1216 prefs->SetString(prefs::kDefaultSearchProviderPrepopulateID, prepopulate_id); 1216 prefs->SetString(prefs::kDefaultSearchProviderPrepopulateID, prepopulate_id);
1217
1218 prefs->ScheduleSavePersistentPrefs();
1219 } 1217 }
1220 1218
1221 bool TemplateURLService::LoadDefaultSearchProviderFromPrefs( 1219 bool TemplateURLService::LoadDefaultSearchProviderFromPrefs(
1222 scoped_ptr<TemplateURL>* default_provider, 1220 scoped_ptr<TemplateURL>* default_provider,
1223 bool* is_managed) { 1221 bool* is_managed) {
1224 PrefService* prefs = GetPrefs(); 1222 PrefService* prefs = GetPrefs();
1225 if (!prefs || !prefs->HasPrefPath(prefs::kDefaultSearchProviderSearchURL)) 1223 if (!prefs || !prefs->HasPrefPath(prefs::kDefaultSearchProviderSearchURL))
1226 return false; 1224 return false;
1227 1225
1228 const PrefService::Preference* pref = 1226 const PrefService::Preference* pref =
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1883 i != template_urls->end(); ++i) { 1881 i != template_urls->end(); ++i) {
1884 TemplateURL* template_url = *i; 1882 TemplateURL* template_url = *i;
1885 DCHECK(template_url); 1883 DCHECK(template_url);
1886 if (template_url->sync_guid().empty()) { 1884 if (template_url->sync_guid().empty()) {
1887 template_url->set_sync_guid(guid::GenerateGUID()); 1885 template_url->set_sync_guid(guid::GenerateGUID());
1888 if (service_.get()) 1886 if (service_.get())
1889 service_->UpdateKeyword(*template_url); 1887 service_->UpdateKeyword(*template_url);
1890 } 1888 }
1891 } 1889 }
1892 } 1890 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/sync/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698