| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/network_time/network_time_service.h" | 5 #include "chrome/browser/network_time/network_time_service.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/browser/network_time/network_time_tracker.h" | 9 #include "chrome/browser/network_time/network_time_tracker.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 #include "components/user_prefs/pref_registry_syncable.h" | 13 #include "components/pref_registry/pref_registry_syncable.h" |
| 14 | 14 |
| 15 // static | 15 // static |
| 16 void NetworkTimeService::RegisterProfilePrefs( | 16 void NetworkTimeService::RegisterProfilePrefs( |
| 17 user_prefs::PrefRegistrySyncable* registry) { | 17 user_prefs::PrefRegistrySyncable* registry) { |
| 18 registry->RegisterDictionaryPref( | 18 registry->RegisterDictionaryPref( |
| 19 prefs::kNetworkTimeMapping, | 19 prefs::kNetworkTimeMapping, |
| 20 new base::DictionaryValue(), | 20 new base::DictionaryValue(), |
| 21 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 21 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 22 } | 22 } |
| 23 | 23 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 if (!network_time_tracker_->GetNetworkTime(base::TimeTicks::Now(), | 78 if (!network_time_tracker_->GetNetworkTime(base::TimeTicks::Now(), |
| 79 &network_time_now, NULL)) { | 79 &network_time_now, NULL)) { |
| 80 return local_time; | 80 return local_time; |
| 81 } | 81 } |
| 82 return local_time + (network_time_now - base::Time::Now()); | 82 return local_time + (network_time_now - base::Time::Now()); |
| 83 } | 83 } |
| 84 | 84 |
| 85 base::Time NetworkTimeService::GetNetworkNow() { | 85 base::Time NetworkTimeService::GetNetworkNow() { |
| 86 return GetNetworkTime(base::Time::Now()); | 86 return GetNetworkTime(base::Time::Now()); |
| 87 } | 87 } |
| OLD | NEW |