diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome/browser/google | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google')
| -rw-r--r-- | chrome/browser/google/google_update.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index feff84c..06d6591 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -10,19 +10,19 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/task.h" #include "base/threading/thread.h" #include "base/win/registry.h" +#include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" #include "content/browser/browser_thread.h" -#include "views/window/window.h" #include "google_update_idl_i.c" +#include "views/window/window.h" using views::Window; @@ -235,7 +235,7 @@ class GoogleUpdateJobObserver // Allows us control the upgrade process to a small degree. After OnComplete // has been called, this object can not be used. - ScopedComPtr<IProgressWndEvents> event_sink_; + base::win::ScopedComPtr<IProgressWndEvents> event_sink_; }; //////////////////////////////////////////////////////////////////////////////// @@ -292,9 +292,9 @@ bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer, main_loop); } - ScopedComPtr<IJobObserver> job_holder(job_observer); + base::win::ScopedComPtr<IJobObserver> job_holder(job_observer); - ScopedComPtr<IGoogleUpdate> on_demand; + base::win::ScopedComPtr<IGoogleUpdate> on_demand; bool system_level = false; |