| 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/upgrade_detector_impl.h" | 5 #include "chrome/browser/upgrade_detector_impl.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 28 #include "components/network_time/network_time_tracker.h" | 28 #include "components/network_time/network_time_tracker.h" |
| 29 #include "components/prefs/pref_service.h" | 29 #include "components/prefs/pref_service.h" |
| 30 #include "components/version_info/version_info.h" | 30 #include "components/version_info/version_info.h" |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 | 32 |
| 33 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
| 34 #include "base/win/win_util.h" | 34 #include "base/win/win_util.h" |
| 35 #include "chrome/installer/util/browser_distribution.h" | 35 #include "chrome/installer/util/browser_distribution.h" |
| 36 #include "chrome/installer/util/google_update_settings.h" | 36 #include "chrome/installer/util/google_update_settings.h" |
| 37 #include "chrome/installer/util/helper.h" | |
| 38 #include "chrome/installer/util/install_util.h" | 37 #include "chrome/installer/util/install_util.h" |
| 39 #elif defined(OS_MACOSX) | 38 #elif defined(OS_MACOSX) |
| 40 #include "chrome/browser/mac/keystone_glue.h" | 39 #include "chrome/browser/mac/keystone_glue.h" |
| 41 #endif | 40 #endif |
| 42 | 41 |
| 43 using content::BrowserThread; | 42 using content::BrowserThread; |
| 44 | 43 |
| 45 namespace { | 44 namespace { |
| 46 | 45 |
| 47 // How long (in milliseconds) to wait (each cycle) before checking whether | 46 // How long (in milliseconds) to wait (each cycle) before checking whether |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 | 505 |
| 507 // static | 506 // static |
| 508 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { | 507 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { |
| 509 return base::Singleton<UpgradeDetectorImpl>::get(); | 508 return base::Singleton<UpgradeDetectorImpl>::get(); |
| 510 } | 509 } |
| 511 | 510 |
| 512 // static | 511 // static |
| 513 UpgradeDetector* UpgradeDetector::GetInstance() { | 512 UpgradeDetector* UpgradeDetector::GetInstance() { |
| 514 return UpgradeDetectorImpl::GetInstance(); | 513 return UpgradeDetectorImpl::GetInstance(); |
| 515 } | 514 } |
| OLD | NEW |