| 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/upgrade_detector_chromeos.h" | 5 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
| 6 | 6 |
| 7 #include <stdint.h> |
| 8 |
| 9 #include "base/macros.h" |
| 7 #include "base/memory/singleton.h" | 10 #include "base/memory/singleton.h" |
| 8 #include "chromeos/dbus/dbus_thread_manager.h" | 11 #include "chromeos/dbus/dbus_thread_manager.h" |
| 9 #include "chromeos/dbus/update_engine_client.h" | 12 #include "chromeos/dbus/update_engine_client.h" |
| 10 | 13 |
| 11 using chromeos::DBusThreadManager; | 14 using chromeos::DBusThreadManager; |
| 12 using chromeos::UpdateEngineClient; | 15 using chromeos::UpdateEngineClient; |
| 13 | 16 |
| 14 namespace { | 17 namespace { |
| 15 | 18 |
| 16 // How long to wait (each cycle) before checking which severity level we should | 19 // How long to wait (each cycle) before checking which severity level we should |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 upgrade_detected_time_ = base::Time::Now(); | 98 upgrade_detected_time_ = base::Time::Now(); |
| 96 | 99 |
| 97 channels_requester_.reset(new UpgradeDetectorChromeos::ChannelsRequester()); | 100 channels_requester_.reset(new UpgradeDetectorChromeos::ChannelsRequester()); |
| 98 channels_requester_->RequestChannels( | 101 channels_requester_->RequestChannels( |
| 99 base::Bind(&UpgradeDetectorChromeos::OnChannelsReceived, | 102 base::Bind(&UpgradeDetectorChromeos::OnChannelsReceived, |
| 100 weak_factory_.GetWeakPtr())); | 103 weak_factory_.GetWeakPtr())); |
| 101 } | 104 } |
| 102 | 105 |
| 103 void UpgradeDetectorChromeos::NotifyOnUpgrade() { | 106 void UpgradeDetectorChromeos::NotifyOnUpgrade() { |
| 104 base::TimeDelta delta = base::Time::Now() - upgrade_detected_time_; | 107 base::TimeDelta delta = base::Time::Now() - upgrade_detected_time_; |
| 105 int64 time_passed = delta.InDays(); | 108 int64_t time_passed = delta.InDays(); |
| 106 | 109 |
| 107 const int kSevereThreshold = 7; | 110 const int kSevereThreshold = 7; |
| 108 const int kHighThreshold = 4; | 111 const int kHighThreshold = 4; |
| 109 const int kElevatedThreshold = 2; | 112 const int kElevatedThreshold = 2; |
| 110 const int kLowThreshold = 0; | 113 const int kLowThreshold = 0; |
| 111 | 114 |
| 112 // These if statements must be sorted (highest interval first). | 115 // These if statements must be sorted (highest interval first). |
| 113 if (time_passed >= kSevereThreshold) { | 116 if (time_passed >= kSevereThreshold) { |
| 114 set_upgrade_notification_stage(UPGRADE_ANNOYANCE_SEVERE); | 117 set_upgrade_notification_stage(UPGRADE_ANNOYANCE_SEVERE); |
| 115 | 118 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 153 |
| 151 // static | 154 // static |
| 152 UpgradeDetectorChromeos* UpgradeDetectorChromeos::GetInstance() { | 155 UpgradeDetectorChromeos* UpgradeDetectorChromeos::GetInstance() { |
| 153 return base::Singleton<UpgradeDetectorChromeos>::get(); | 156 return base::Singleton<UpgradeDetectorChromeos>::get(); |
| 154 } | 157 } |
| 155 | 158 |
| 156 // static | 159 // static |
| 157 UpgradeDetector* UpgradeDetector::GetInstance() { | 160 UpgradeDetector* UpgradeDetector::GetInstance() { |
| 158 return UpgradeDetectorChromeos::GetInstance(); | 161 return UpgradeDetectorChromeos::GetInstance(); |
| 159 } | 162 } |
| OLD | NEW |