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 #ifndef CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ |
6 #define CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ | 6 #define CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
10 #include "base/timer/timer.h" | 11 #include "base/timer/timer.h" |
11 #include "chrome/browser/upgrade_detector.h" | 12 #include "chrome/browser/upgrade_detector.h" |
12 #include "chromeos/dbus/update_engine_client.h" | 13 #include "chromeos/dbus/update_engine_client.h" |
13 | 14 |
14 namespace base { | 15 namespace base { |
15 template <typename T> | 16 template <typename T> |
16 struct DefaultSingletonTraits; | 17 struct DefaultSingletonTraits; |
17 } // namespace base | 18 } // namespace base |
18 | 19 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 base::Time upgrade_detected_time_; | 57 base::Time upgrade_detected_time_; |
57 | 58 |
58 scoped_ptr<ChannelsRequester> channels_requester_; | 59 scoped_ptr<ChannelsRequester> channels_requester_; |
59 | 60 |
60 base::WeakPtrFactory<UpgradeDetectorChromeos> weak_factory_; | 61 base::WeakPtrFactory<UpgradeDetectorChromeos> weak_factory_; |
61 | 62 |
62 DISALLOW_COPY_AND_ASSIGN(UpgradeDetectorChromeos); | 63 DISALLOW_COPY_AND_ASSIGN(UpgradeDetectorChromeos); |
63 }; | 64 }; |
64 | 65 |
65 #endif // CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ | 66 #endif // CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_ |
OLD | NEW |