Index: chrome/browser/google/google_update_win.cc |
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update_win.cc |
similarity index 97% |
rename from chrome/browser/google/google_update.cc |
rename to chrome/browser/google/google_update_win.cc |
index b502f6b13922a0402d52d90be1a99d303de02d10..bff4e28e7e67c9794c093270e6e6aa8fe6c8b1ac 100644 |
--- a/chrome/browser/google/google_update.cc |
+++ b/chrome/browser/google/google_update_win.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/google/google_update.h" |
+#include "chrome/browser/google/google_update_win.h" |
#include <atlbase.h> |
#include <atlcom.h> |
@@ -235,8 +235,7 @@ GoogleUpdate::GoogleUpdate() |
GoogleUpdate::~GoogleUpdate() { |
} |
-void GoogleUpdate::CheckForUpdate(bool install_if_newer, |
- views::Widget* window) { |
+void GoogleUpdate::CheckForUpdate(bool install_if_newer, HWND window) { |
// We need to shunt this request over to InitiateGoogleUpdateCheck and have |
// it run in the file thread. |
BrowserThread::PostTask( |
@@ -249,7 +248,7 @@ void GoogleUpdate::CheckForUpdate(bool install_if_newer, |
// GoogleUpdate, private: |
void GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, |
- views::Widget* window, |
+ HWND window, |
MessageLoop* main_loop) { |
FilePath chrome_exe; |
if (!PathService::Get(base::DIR_EXE, &chrome_exe)) |
@@ -295,13 +294,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, window, |
reinterpret_cast<void**>(on_demand.Receive())); |
} |
system_level = true; |