Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5248)

Unified Diff: chrome/browser/google/google_update.cc

Issue 10698106: Switch about box to web ui on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added GetForegroundWindow Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google/google_update.h ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_update.cc
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc
index b502f6b13922a0402d52d90be1a99d303de02d10..c1ee52a2a7a372ed2398a9709d7e121eb0975f95 100644
--- a/chrome/browser/google/google_update.cc
+++ b/chrome/browser/google/google_update.cc
@@ -235,21 +235,19 @@ GoogleUpdate::GoogleUpdate()
GoogleUpdate::~GoogleUpdate() {
}
-void GoogleUpdate::CheckForUpdate(bool install_if_newer,
- views::Widget* window) {
+void GoogleUpdate::CheckForUpdate(bool install_if_newer) {
// We need to shunt this request over to InitiateGoogleUpdateCheck and have
// it run in the file thread.
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
base::Bind(&GoogleUpdate::InitiateGoogleUpdateCheck, this,
- install_if_newer, window, MessageLoop::current()));
+ install_if_newer, MessageLoop::current()));
}
////////////////////////////////////////////////////////////////////////////////
// GoogleUpdate, private:
void GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer,
- views::Widget* window,
MessageLoop* main_loop) {
FilePath chrome_exe;
if (!PathService::Get(base::DIR_EXE, &chrome_exe))
@@ -295,13 +293,8 @@ void GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer,
if (!install_if_newer) {
hr = on_demand.CreateInstance(CLSID_OnDemandMachineAppsClass);
} else {
- HWND foreground_hwnd = NULL;
- if (window != NULL) {
- foreground_hwnd = window->GetNativeWindow();
- }
-
hr = CoCreateInstanceAsAdmin(CLSID_OnDemandMachineAppsClass,
- IID_IGoogleUpdate, foreground_hwnd,
+ IID_IGoogleUpdate, GetForegroundWindow(),
Ben Goodger (Google) 2012/07/09 22:28:01 Will this always return the foreground-most window
MAD 2012/07/10 00:20:09 Yes, but I think that's OK, it's just that the ele
reinterpret_cast<void**>(on_demand.Receive()));
}
system_level = true;
« no previous file with comments | « chrome/browser/google/google_update.h ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698