Commit 54a4ff1a authored by grt@chromium.org's avatar grt@chromium.org

Don't inhibit checking for pending updates for domain-enrolled machines.

Only the check for an outdated install should be suppressed in this case.

BUG=342465
R=robertshield@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/277403003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269840 0039d316-1c4b-4281-b951-d872f2087c98
parent ecc70025
...@@ -127,10 +127,10 @@ bool IsSystemInstall() { ...@@ -127,10 +127,10 @@ bool IsSystemInstall() {
return !InstallUtil::IsPerUserInstall(exe_path.value().c_str()); return !InstallUtil::IsPerUserInstall(exe_path.value().c_str());
} }
// This task checks the update policy and calls back the task only if the // Sets |is_unstable_channel| to true if the current chrome is on the dev or
// system is not enrolled in a domain (i.e., not in an enterprise environment). // canary channels. Sets |is_auto_update_enabled| to true if Google Update will
// It also identifies if autoupdate is enabled and whether we are running an // update the current chrome. Unconditionally posts |callback_task| to the UI
// unstable channel. |is_auto_update_enabled| can be NULL. // thread to continue processing.
void DetectUpdatability(const base::Closure& callback_task, void DetectUpdatability(const base::Closure& callback_task,
bool* is_unstable_channel, bool* is_unstable_channel,
bool* is_auto_update_enabled) { bool* is_auto_update_enabled) {
...@@ -144,9 +144,7 @@ void DetectUpdatability(const base::Closure& callback_task, ...@@ -144,9 +144,7 @@ void DetectUpdatability(const base::Closure& callback_task,
GoogleUpdateSettings::AreAutoupdatesEnabled(app_guid); GoogleUpdateSettings::AreAutoupdatesEnabled(app_guid);
} }
*is_unstable_channel = IsUnstableChannel(); *is_unstable_channel = IsUnstableChannel();
// Don't show the update bubbles to entreprise users (i.e., on a domain). BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_task);
if (!base::win::IsEnrolledToDomain())
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback_task);
} }
#endif // defined(OS_WIN) #endif // defined(OS_WIN)
...@@ -367,6 +365,10 @@ bool UpgradeDetectorImpl::DetectOutdatedInstall() { ...@@ -367,6 +365,10 @@ bool UpgradeDetectorImpl::DetectOutdatedInstall() {
return false; return false;
#if defined(OS_WIN) #if defined(OS_WIN)
// Don't show the update bubbles to entreprise users (i.e., on a domain).
if (base::win::IsEnrolledToDomain())
return false;
// On Windows, we don't want to warn about outdated installs when the // On Windows, we don't want to warn about outdated installs when the
// machine doesn't support SSE2, it's been deprecated starting with M35. // machine doesn't support SSE2, it's been deprecated starting with M35.
if (!base::CPU().has_sse2()) if (!base::CPU().has_sse2())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment