| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 5 #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 
| 6 #define CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 6 #define CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 
| 7 | 7 | 
| 8 #include "base/gtest_prod_util.h" | 8 #include "base/gtest_prod_util.h" | 
| 9 #include "base/macros.h" | 9 #include "base/macros.h" | 
| 10 #include "base/timer/timer.h" | 10 #include "base/timer/timer.h" | 
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 128   void set_upgrade_notification_stage(UpgradeNotificationAnnoyanceLevel stage) { | 128   void set_upgrade_notification_stage(UpgradeNotificationAnnoyanceLevel stage) { | 
| 129     upgrade_notification_stage_ = stage; | 129     upgrade_notification_stage_ = stage; | 
| 130   } | 130   } | 
| 131 | 131 | 
| 132   void set_is_factory_reset_required(bool is_factory_reset_required) { | 132   void set_is_factory_reset_required(bool is_factory_reset_required) { | 
| 133     is_factory_reset_required_ = is_factory_reset_required; | 133     is_factory_reset_required_ = is_factory_reset_required; | 
| 134   } | 134   } | 
| 135 | 135 | 
| 136  private: | 136  private: | 
| 137   FRIEND_TEST_ALL_PREFIXES(AppMenuModelTest, Basics); | 137   FRIEND_TEST_ALL_PREFIXES(AppMenuModelTest, Basics); | 
|  | 138   FRIEND_TEST_ALL_PREFIXES(SystemTrayClientTest, UpdateTrayIcon); | 
| 138 | 139 | 
| 139   // Initiates an Idle check. See IdleCallback below. | 140   // Initiates an Idle check. See IdleCallback below. | 
| 140   void CheckIdle(); | 141   void CheckIdle(); | 
| 141 | 142 | 
| 142   // The callback for the IdleCheck. Tells us whether Chrome has received any | 143   // The callback for the IdleCheck. Tells us whether Chrome has received any | 
| 143   // input events since the specified time. | 144   // input events since the specified time. | 
| 144   void IdleCallback(ui::IdleState state); | 145   void IdleCallback(ui::IdleState state); | 
| 145 | 146 | 
| 146   // Triggers a global notification of the specified |type|. | 147   // Triggers a global notification of the specified |type|. | 
| 147   void TriggerNotification(chrome::NotificationType type); | 148   void TriggerNotification(chrome::NotificationType type); | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 171   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_; | 172   UpgradeNotificationAnnoyanceLevel upgrade_notification_stage_; | 
| 172 | 173 | 
| 173   // Whether we have waited long enough after detecting an upgrade (to see | 174   // Whether we have waited long enough after detecting an upgrade (to see | 
| 174   // is we should start nagging about upgrading). | 175   // is we should start nagging about upgrading). | 
| 175   bool notify_upgrade_; | 176   bool notify_upgrade_; | 
| 176 | 177 | 
| 177   DISALLOW_COPY_AND_ASSIGN(UpgradeDetector); | 178   DISALLOW_COPY_AND_ASSIGN(UpgradeDetector); | 
| 178 }; | 179 }; | 
| 179 | 180 | 
| 180 #endif  // CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 181 #endif  // CHROME_BROWSER_UPGRADE_DETECTOR_H_ | 
| OLD | NEW | 
|---|