OLD | NEW |
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/settings/device_settings_service.h" | 5 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 64 |
65 // static | 65 // static |
66 DeviceSettingsService* DeviceSettingsService::Get() { | 66 DeviceSettingsService* DeviceSettingsService::Get() { |
67 CHECK(g_device_settings_service); | 67 CHECK(g_device_settings_service); |
68 return g_device_settings_service; | 68 return g_device_settings_service; |
69 } | 69 } |
70 | 70 |
71 DeviceSettingsService::DeviceSettingsService() | 71 DeviceSettingsService::DeviceSettingsService() |
72 : session_manager_client_(NULL), | 72 : session_manager_client_(NULL), |
73 store_status_(STORE_SUCCESS), | 73 store_status_(STORE_SUCCESS), |
| 74 user_id_(std::string(), std::string()), |
74 load_retries_left_(kMaxLoadRetries), | 75 load_retries_left_(kMaxLoadRetries), |
75 weak_factory_(this) { | 76 weak_factory_(this) { |
76 } | 77 } |
77 | 78 |
78 DeviceSettingsService::~DeviceSettingsService() { | 79 DeviceSettingsService::~DeviceSettingsService() { |
79 DCHECK(pending_operations_.empty()); | 80 DCHECK(pending_operations_.empty()); |
80 FOR_EACH_OBSERVER(Observer, observers_, OnDeviceSettingsServiceShutdown()); | 81 FOR_EACH_OBSERVER(Observer, observers_, OnDeviceSettingsServiceShutdown()); |
81 } | 82 } |
82 | 83 |
83 void DeviceSettingsService::SetSessionManager( | 84 void DeviceSettingsService::SetSessionManager( |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 if (pending_operations_.empty()) | 144 if (pending_operations_.empty()) |
144 EnqueueLoad(false); | 145 EnqueueLoad(false); |
145 } | 146 } |
146 } | 147 } |
147 | 148 |
148 bool DeviceSettingsService::HasPrivateOwnerKey() { | 149 bool DeviceSettingsService::HasPrivateOwnerKey() { |
149 return owner_settings_service_ && owner_settings_service_->IsOwner(); | 150 return owner_settings_service_ && owner_settings_service_->IsOwner(); |
150 } | 151 } |
151 | 152 |
152 void DeviceSettingsService::InitOwner( | 153 void DeviceSettingsService::InitOwner( |
153 const std::string& username, | 154 const user_manager::UserID& user_id, |
154 const base::WeakPtr<ownership::OwnerSettingsService>& | 155 const base::WeakPtr<ownership::OwnerSettingsService>& |
155 owner_settings_service) { | 156 owner_settings_service) { |
156 // When InitOwner() is called twice with the same |username| it's | 157 // When InitOwner() is called twice with the same |user_id| it's |
157 // worth to reload settings since owner key may become available. | 158 // worth to reload settings since owner key may become available. |
158 if (!username_.empty() && username_ != username) | 159 if (!user_id_.empty() && user_id_ != user_id) |
159 return; | 160 return; |
160 username_ = username; | 161 user_id_ = user_id; |
161 owner_settings_service_ = owner_settings_service; | 162 owner_settings_service_ = owner_settings_service; |
162 | 163 |
163 EnsureReload(true); | 164 EnsureReload(true); |
164 } | 165 } |
165 | 166 |
166 const std::string& DeviceSettingsService::GetUsername() const { | 167 const user_manager::UserID& DeviceSettingsService::GetUserID() const { |
167 return username_; | 168 return user_id_; |
168 } | 169 } |
169 | 170 |
170 ownership::OwnerSettingsService* | 171 ownership::OwnerSettingsService* |
171 DeviceSettingsService::GetOwnerSettingsService() const { | 172 DeviceSettingsService::GetOwnerSettingsService() const { |
172 return owner_settings_service_.get(); | 173 return owner_settings_service_.get(); |
173 } | 174 } |
174 | 175 |
175 void DeviceSettingsService::AddObserver(Observer* observer) { | 176 void DeviceSettingsService::AddObserver(Observer* observer) { |
176 observers_.AddObserver(observer); | 177 observers_.AddObserver(observer); |
177 } | 178 } |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 DeviceSettingsService::Initialize(); | 324 DeviceSettingsService::Initialize(); |
324 } | 325 } |
325 | 326 |
326 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { | 327 ScopedTestDeviceSettingsService::~ScopedTestDeviceSettingsService() { |
327 // Clean pending operations. | 328 // Clean pending operations. |
328 DeviceSettingsService::Get()->UnsetSessionManager(); | 329 DeviceSettingsService::Get()->UnsetSessionManager(); |
329 DeviceSettingsService::Shutdown(); | 330 DeviceSettingsService::Shutdown(); |
330 } | 331 } |
331 | 332 |
332 } // namespace chromeos | 333 } // namespace chromeos |
OLD | NEW |