summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/about_chrome_view.cc
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 16:05:21 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 16:05:21 +0000
commitac4ebebde3fe16fb39ed894377b892621723943f (patch)
treef7ac8bfb6a150170c64028a5c93fa133609e17ec /chrome/browser/views/about_chrome_view.cc
parentad5f54471a107a27a7d975f38651426b6c042fc3 (diff)
downloadchromium_src-ac4ebebde3fe16fb39ed894377b892621723943f.zip
chromium_src-ac4ebebde3fe16fb39ed894377b892621723943f.tar.gz
chromium_src-ac4ebebde3fe16fb39ed894377b892621723943f.tar.bz2
Passing a foreground window to the google update code so that if it triggers UAC prompts, they can launch in the foreground.
Review URL: http://codereview.chromium.org/42606 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/about_chrome_view.cc')
-rw-r--r--chrome/browser/views/about_chrome_view.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 0ef4183..8cfa84f 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -587,7 +587,8 @@ void AboutChromeView::ViewHierarchyChanged(bool is_add,
service_pack_major >= 1) ||
win_util::GetWinVersion() > win_util::WINVERSION_VISTA) {
UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
- google_updater_->CheckForUpdate(false); // false=don't upgrade yet.
+ // CheckForUpdate(false, ...) means don't upgrade yet.
+ google_updater_->CheckForUpdate(false, window());
}
} else {
parent->RemoveChildView(&update_label_);
@@ -668,7 +669,8 @@ bool AboutChromeView::Accept() {
DCHECK(!google_updater_);
google_updater_ = new GoogleUpdate();
google_updater_->AddStatusChangeListener(this);
- google_updater_->CheckForUpdate(true); // true=upgrade if new version found.
+ // CheckForUpdate(true,...) means perform the upgrade if new version found.
+ google_updater_->CheckForUpdate(true, window());
return false; // We never allow this button to close the window.
}