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

Side by Side Diff: chrome/browser/chromeos/customization_document.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 7 years, 10 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/chromeos/customization_document.h" 5 #include "chrome/browser/chromeos/customization_document.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/string_tokenizer.h" 13 #include "base/string_tokenizer.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/time.h" 15 #include "base/time.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/chromeos/cros/cros_library.h" 18 #include "chrome/browser/chromeos/cros/cros_library.h"
19 #include "chrome/browser/chromeos/cros/network_library.h" 19 #include "chrome/browser/chromeos/cros/network_library.h"
20 #include "chrome/browser/chromeos/login/wizard_controller.h" 20 #include "chrome/browser/chromeos/login/wizard_controller.h"
21 #include "chrome/browser/chromeos/system/statistics_provider.h" 21 #include "chrome/browser/chromeos/system/statistics_provider.h"
22 #include "chrome/browser/prefs/pref_registry_simple.h"
22 #include "chrome/browser/prefs/pref_service.h" 23 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/profiles/profile_manager.h" 24 #include "chrome/browser/profiles/profile_manager.h"
24 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
25 #include "net/url_request/url_fetcher.h" 26 #include "net/url_request/url_fetcher.h"
26 27
27 using content::BrowserThread; 28 using content::BrowserThread;
28 29
29 // Manifest attributes names. 30 // Manifest attributes names.
30 31
31 namespace { 32 namespace {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 ServicesCustomizationDocument::~ServicesCustomizationDocument() {} 243 ServicesCustomizationDocument::~ServicesCustomizationDocument() {}
243 244
244 // static 245 // static
245 ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() { 246 ServicesCustomizationDocument* ServicesCustomizationDocument::GetInstance() {
246 return Singleton<ServicesCustomizationDocument, 247 return Singleton<ServicesCustomizationDocument,
247 DefaultSingletonTraits<ServicesCustomizationDocument> >::get(); 248 DefaultSingletonTraits<ServicesCustomizationDocument> >::get();
248 } 249 }
249 250
250 // static 251 // static
251 void ServicesCustomizationDocument::RegisterPrefs( 252 void ServicesCustomizationDocument::RegisterPrefs(
252 PrefServiceSimple* local_state) { 253 PrefRegistrySimple* local_state) {
253 local_state->RegisterBooleanPref(kServicesCustomizationAppliedPref, false); 254 local_state->RegisterBooleanPref(kServicesCustomizationAppliedPref, false);
254 } 255 }
255 256
256 // static 257 // static
257 bool ServicesCustomizationDocument::WasApplied() { 258 bool ServicesCustomizationDocument::WasApplied() {
258 PrefService* prefs = g_browser_process->local_state(); 259 PrefService* prefs = g_browser_process->local_state();
259 return prefs->GetBoolean(kServicesCustomizationAppliedPref); 260 return prefs->GetBoolean(kServicesCustomizationAppliedPref);
260 } 261 }
261 262
262 // static 263 // static
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 locale, kAppContentAttr, kInitialStartPageAttr); 336 locale, kAppContentAttr, kInitialStartPageAttr);
336 } 337 }
337 338
338 std::string ServicesCustomizationDocument::GetSupportPage( 339 std::string ServicesCustomizationDocument::GetSupportPage(
339 const std::string& locale) const { 340 const std::string& locale) const {
340 return GetLocaleSpecificString( 341 return GetLocaleSpecificString(
341 locale, kAppContentAttr, kSupportPageAttr); 342 locale, kAppContentAttr, kSupportPageAttr);
342 } 343 }
343 344
344 } // namespace chromeos 345 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698