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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/build_time.h" | 10 #include "base/build_time.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/files/file_path.h" | 12 #include "base/files/file_path.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/memory/singleton.h" | 14 #include "base/memory/singleton.h" |
15 #include "base/metrics/field_trial.h" | 15 #include "base/metrics/field_trial.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/process/launch.h" | |
17 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
18 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
19 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
20 #include "base/time/time.h" | 21 #include "base/time/time.h" |
21 #include "base/version.h" | 22 #include "base/version.h" |
22 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
23 #include "chrome/browser/google/google_util.h" | 24 #include "chrome/browser/google/google_util.h" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/chrome_version_info.h" | 26 #include "chrome/common/chrome_version_info.h" |
26 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
27 #include "ui/base/resource/resource_bundle.h" | 28 #include "ui/base/resource/resource_bundle.h" |
28 | 29 |
29 #if defined(OS_WIN) | 30 #if defined(OS_WIN) |
30 #include "chrome/installer/util/browser_distribution.h" | 31 #include "chrome/installer/util/browser_distribution.h" |
31 #include "chrome/installer/util/google_update_settings.h" | 32 #include "chrome/installer/util/google_update_settings.h" |
32 #include "chrome/installer/util/helper.h" | 33 #include "chrome/installer/util/helper.h" |
33 #include "chrome/installer/util/install_util.h" | 34 #include "chrome/installer/util/install_util.h" |
34 #elif defined(OS_MACOSX) | 35 #elif defined(OS_MACOSX) |
35 #include "chrome/browser/mac/keystone_glue.h" | 36 #include "chrome/browser/mac/keystone_glue.h" |
36 #elif defined(OS_POSIX) | 37 #elif defined(OS_POSIX) |
Nico
2013/07/22 21:02:02
If this really doesn't have to be conditional anym
Robert Sesek
2013/07/22 21:17:19
Done.
| |
37 #include "base/process_util.h" | |
38 #endif | 38 #endif |
39 | 39 |
40 using content::BrowserThread; | 40 using content::BrowserThread; |
41 | 41 |
42 namespace { | 42 namespace { |
43 | 43 |
44 // How long (in milliseconds) to wait (each cycle) before checking whether | 44 // How long (in milliseconds) to wait (each cycle) before checking whether |
45 // Chrome's been upgraded behind our back. | 45 // Chrome's been upgraded behind our back. |
46 const int kCheckForUpgradeMs = 2 * 60 * 60 * 1000; // 2 hours. | 46 const int kCheckForUpgradeMs = 2 * 60 * 60 * 1000; // 2 hours. |
47 | 47 |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
432 | 432 |
433 // static | 433 // static |
434 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { | 434 UpgradeDetectorImpl* UpgradeDetectorImpl::GetInstance() { |
435 return Singleton<UpgradeDetectorImpl>::get(); | 435 return Singleton<UpgradeDetectorImpl>::get(); |
436 } | 436 } |
437 | 437 |
438 // static | 438 // static |
439 UpgradeDetector* UpgradeDetector::GetInstance() { | 439 UpgradeDetector* UpgradeDetector::GetInstance() { |
440 return UpgradeDetectorImpl::GetInstance(); | 440 return UpgradeDetectorImpl::GetInstance(); |
441 } | 441 } |
OLD | NEW |