From 2fdd00a4c6a07856180347c6d147b27c10ae14ff Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Mon, 13 Jun 2011 21:56:26 +0000 Subject: Eliminate Window completely. BUG=72040 TEST=none Review URL: http://codereview.chromium.org/7108047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88905 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/google/google_update.cc | 9 ++++----- chrome/browser/google/google_update.h | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'chrome/browser/google') diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index 06d6591..097b18f 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -22,9 +22,7 @@ #include "chrome/installer/util/install_util.h" #include "content/browser/browser_thread.h" #include "google_update_idl_i.c" -#include "views/window/window.h" - -using views::Window; +#include "views/widget/widget.h" namespace { @@ -251,7 +249,8 @@ GoogleUpdate::~GoogleUpdate() { //////////////////////////////////////////////////////////////////////////////// // GoogleUpdate, views::DialogDelegate implementation: -void GoogleUpdate::CheckForUpdate(bool install_if_newer, Window* window) { +void GoogleUpdate::CheckForUpdate(bool install_if_newer, + views::Widget* window) { // We need to shunt this request over to InitiateGoogleUpdateCheck and have // it run in the file thread. BrowserThread::PostTask( @@ -265,7 +264,7 @@ void GoogleUpdate::CheckForUpdate(bool install_if_newer, Window* window) { // GoogleUpdate, private: bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, - Window* window, + views::Widget* window, MessageLoop* main_loop) { FilePath chrome_exe_path; if (!PathService::Get(base::DIR_EXE, &chrome_exe_path)) { diff --git a/chrome/browser/google/google_update.h b/chrome/browser/google/google_update.h index dcc68f0..293f2ca 100644 --- a/chrome/browser/google/google_update.h +++ b/chrome/browser/google/google_update.h @@ -16,7 +16,7 @@ class MessageLoop; namespace views { -class Window; +class Widget; } // The status of the upgrade. UPGRADE_STARTED and UPGRADE_CHECK_STARTED are @@ -94,7 +94,7 @@ class GoogleUpdate : public base::RefCountedThreadSafe { // |window| should point to a foreground window. This is needed to ensure // that Vista/Windows 7 UAC prompts show up in the foreground. It may also // be null. - void CheckForUpdate(bool install_if_newer, views::Window* window); + void CheckForUpdate(bool install_if_newer, views::Widget* window); // Pass NULL to clear the listener void set_status_listener(GoogleUpdateStatusListener* listener) { @@ -123,7 +123,7 @@ class GoogleUpdate : public base::RefCountedThreadSafe { // to the message loop that we want the response to come from. // |window| should point to a foreground window. This is needed to ensure that // Vista/Windows 7 UAC prompts show up in the foreground. It may also be null. - bool InitiateGoogleUpdateCheck(bool install_if_newer, views::Window* window, + bool InitiateGoogleUpdateCheck(bool install_if_newer, views::Widget* window, MessageLoop* main_loop); // This function reports the results of the GoogleUpdate operation to the -- cgit v1.1