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 /printing | |
| 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 'printing')
| -rw-r--r-- | printing/backend/print_backend_win.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc index 4a82207..480f4b8 100644 --- a/printing/backend/print_backend_win.cc +++ b/printing/backend/print_backend_win.cc @@ -16,9 +16,6 @@ #include "printing/backend/print_backend_consts.h" #include "printing/backend/win_helper.h" -using base::win::ScopedBstr; -using base::win::ScopedComPtr; - namespace { HRESULT StreamOnHGlobalToString(IStream* stream, std::string* out) { @@ -111,12 +108,12 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults( HRESULT hr = XPSModule::OpenProvider(printer_name_wide, 1, &provider); DCHECK(SUCCEEDED(hr)); if (provider) { - ScopedComPtr<IStream> print_capabilities_stream; + base::win::ScopedComPtr<IStream> print_capabilities_stream; hr = CreateStreamOnHGlobal(NULL, TRUE, print_capabilities_stream.Receive()); DCHECK(SUCCEEDED(hr)); if (print_capabilities_stream) { - ScopedBstr error; + base::win::ScopedBstr error; hr = XPSModule::GetPrintCapabilities(provider, NULL, print_capabilities_stream, @@ -146,7 +143,7 @@ bool PrintBackendWin::GetPrinterCapsAndDefaults( DocumentProperties( NULL, printer_handle, const_cast<LPTSTR>(printer_name_wide.c_str()), devmode_out, NULL, DM_OUT_BUFFER); - ScopedComPtr<IStream> printer_defaults_stream; + base::win::ScopedComPtr<IStream> printer_defaults_stream; hr = CreateStreamOnHGlobal(NULL, TRUE, printer_defaults_stream.Receive()); DCHECK(SUCCEEDED(hr)); |