Upstream version 9.37.195.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / settings / device_settings_service.cc

diff --git a/src/chrome/browser/chromeos/settings/device_settings_service.cc b/src/chrome/browser/chromeos/settings/device_settings_service.cc
index f7f8271..9c7eff7 100644 (file)
--- a/src/chrome/browser/chromeos/settings/device_settings_service.cc
+++ b/src/chrome/browser/chromeos/settings/device_settings_service.cc
@@ -187,7 +187,9 @@ bool DeviceSettingsService::HasPrivateOwnerKey() {
 void DeviceSettingsService::InitOwner(
     const std::string& username,
     const base::WeakPtr<PrivateKeyDelegate>& delegate) {
-  if (!username_.empty())
+  // When InitOwner() is called twice with the same |username| it's
+  // worth to reload settings since owner key may become available.
+  if (!username_.empty() && username_ != username)
     return;
   username_ = username;
   delegate_ = delegate;