diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 20:44:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 20:44:06 +0000 |
| commit | ae760345b132ccb6b50e8a758dd4e8d2662e93c5 (patch) | |
| tree | d5af1d12e4e74ad1bfc8cd27641273f025f9c64c /chrome/browser/upgrade_detector_impl.cc | |
| parent | cd892a0146c9c22aefde4e272814fed5617d3ad2 (diff) | |
| download | chromium_src-ae760345b132ccb6b50e8a758dd4e8d2662e93c5.zip chromium_src-ae760345b132ccb6b50e8a758dd4e8d2662e93c5.tar.gz chromium_src-ae760345b132ccb6b50e8a758dd4e8d2662e93c5.tar.bz2 | |
Add ReenableAutoupdatesForApp and AreAutoupdatesEnabled methods to GoogleUpdateSettings.
AreAutoupdatesEnabled is a more comprehensive adjunct to the existing GetAppUpdatePolicy() which doesn't look at all the ways updates can be disabled.
Also changes UpgradeDetector to use the new AreAutoupdatesEnabled method.
BUG=164681,171271
TEST=unit_tests.exe --gtest_filter=*GoogleUpdateTest*
Review URL: https://codereview.chromium.org/206613007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/upgrade_detector_impl.cc')
| -rw-r--r-- | chrome/browser/upgrade_detector_impl.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index f293453..f3a7180 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -33,8 +33,6 @@ #include "chrome/installer/util/install_util.h" #elif defined(OS_MACOSX) #include "chrome/browser/mac/keystone_glue.h" -#elif defined(OS_POSIX) -#include "base/process/launch.h" #endif using content::BrowserThread; @@ -118,10 +116,8 @@ void DetectUpdatability(const base::Closure& callback_task, base::string16 app_guid = installer::GetAppGuidForUpdates(IsSystemInstall()); DCHECK(!app_guid.empty()); - if (GoogleUpdateSettings::AUTOMATIC_UPDATES == - GoogleUpdateSettings::GetAppUpdatePolicy(app_guid, NULL)) { + if (GoogleUpdateSettings::AreAutoupdatesEnabled(app_guid)) CheckForUnstableChannel(callback_task, is_unstable_channel); - } } #endif // defined(OS_WIN) |