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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.cc

Issue 738843002: Call to CrosSettings::Set() is replaced by OwnerSettingsService::Set() in VersionUpdaterCros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed non-chromeos builds. Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ownership/owner_settings_service_chromeos_fact ory.h" 5 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 8 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/chromeos/settings/device_settings_service.h" 10 #include "chrome/browser/chromeos/settings/device_settings_service.h"
(...skipping 23 matching lines...) Expand all
34 "OwnerSettingsService", 34 "OwnerSettingsService",
35 BrowserContextDependencyManager::GetInstance()) { 35 BrowserContextDependencyManager::GetInstance()) {
36 } 36 }
37 37
38 OwnerSettingsServiceChromeOSFactory::~OwnerSettingsServiceChromeOSFactory() { 38 OwnerSettingsServiceChromeOSFactory::~OwnerSettingsServiceChromeOSFactory() {
39 } 39 }
40 40
41 // static 41 // static
42 OwnerSettingsServiceChromeOS* 42 OwnerSettingsServiceChromeOS*
43 OwnerSettingsServiceChromeOSFactory::GetForProfile(Profile* profile) { 43 OwnerSettingsServiceChromeOSFactory::GetForProfile(Profile* profile) {
44 return static_cast<OwnerSettingsServiceChromeOS*>( 44 return GetForBrowserContext(profile);
45 GetInstance()->GetServiceForBrowserContext(profile, true));
46 } 45 }
47 46
48 // static 47 // static
48 OwnerSettingsServiceChromeOS*
49 OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
50 content::BrowserContext* context) {
51 return static_cast<OwnerSettingsServiceChromeOS*>(
52 GetInstance()->GetServiceForBrowserContext(context, true));
53 }
54
55 // static
49 OwnerSettingsServiceChromeOSFactory* 56 OwnerSettingsServiceChromeOSFactory*
50 OwnerSettingsServiceChromeOSFactory::GetInstance() { 57 OwnerSettingsServiceChromeOSFactory::GetInstance() {
51 return Singleton<OwnerSettingsServiceChromeOSFactory>::get(); 58 return Singleton<OwnerSettingsServiceChromeOSFactory>::get();
52 } 59 }
53 60
54 // static 61 // static
55 void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting( 62 void OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
56 DeviceSettingsService* device_settings_service) { 63 DeviceSettingsService* device_settings_service) {
57 g_device_settings_service_for_testing_ = device_settings_service; 64 g_device_settings_service_for_testing_ = device_settings_service;
58 } 65 }
(...skipping 30 matching lines...) Expand all
89 const { 96 const {
90 return true; 97 return true;
91 } 98 }
92 99
93 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor( 100 KeyedService* OwnerSettingsServiceChromeOSFactory::BuildServiceInstanceFor(
94 content::BrowserContext* context) const { 101 content::BrowserContext* context) const {
95 return BuildInstanceFor(context); 102 return BuildInstanceFor(context);
96 } 103 }
97 104
98 } // namespace chromeos 105 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698