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

Unified Diff: printing/backend/win_helper.cc

Issue 10387107: Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « printing/backend/win_helper.h ('k') | printing/print_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/backend/win_helper.cc
===================================================================
--- printing/backend/win_helper.cc (revision 137269)
+++ printing/backend/win_helper.cc (working copy)
@@ -9,52 +9,53 @@
#include "base/file_path.h"
#include "base/file_version_info.h"
#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "printing/backend/print_backend.h"
#include "printing/backend/print_backend_consts.h"
namespace {
-typedef HRESULT (WINAPI *PTOpenProviderProc)(PCWSTR printer_name,
+typedef HRESULT (WINAPI* PTOpenProviderProc)(PCWSTR printer_name,
DWORD version,
- HPTPROVIDER *provider);
-typedef HRESULT (WINAPI *PTGetPrintCapabilitiesProc)(HPTPROVIDER provider,
- IStream *print_ticket,
- IStream *capabilities,
+ HPTPROVIDER* provider);
+typedef HRESULT (WINAPI* PTGetPrintCapabilitiesProc)(HPTPROVIDER provider,
+ IStream* print_ticket,
+ IStream* capabilities,
BSTR* error_message);
-typedef HRESULT (WINAPI *PTConvertDevModeToPrintTicketProc)(
+typedef HRESULT (WINAPI* PTConvertDevModeToPrintTicketProc)(
HPTPROVIDER provider,
ULONG devmode_size_in_bytes,
PDEVMODE devmode,
EPrintTicketScope scope,
IStream* print_ticket);
-typedef HRESULT (WINAPI *PTConvertPrintTicketToDevModeProc)(
+typedef HRESULT (WINAPI* PTConvertPrintTicketToDevModeProc)(
HPTPROVIDER provider,
IStream* print_ticket,
EDefaultDevmodeType base_devmode_type,
EPrintTicketScope scope,
ULONG* devmode_byte_count,
- PDEVMODE *devmode,
+ PDEVMODE* devmode,
BSTR* error_message);
-typedef HRESULT (WINAPI *PTMergeAndValidatePrintTicketProc)(
+typedef HRESULT (WINAPI* PTMergeAndValidatePrintTicketProc)(
HPTPROVIDER provider,
IStream* base_ticket,
IStream* delta_ticket,
EPrintTicketScope scope,
IStream* result_ticket,
BSTR* error_message);
-typedef HRESULT (WINAPI *PTReleaseMemoryProc)(PVOID buffer);
-typedef HRESULT (WINAPI *PTCloseProviderProc)(HPTPROVIDER provider);
-typedef HRESULT (WINAPI *StartXpsPrintJobProc)(
+typedef HRESULT (WINAPI* PTReleaseMemoryProc)(PVOID buffer);
+typedef HRESULT (WINAPI* PTCloseProviderProc)(HPTPROVIDER provider);
+typedef HRESULT (WINAPI* StartXpsPrintJobProc)(
const LPCWSTR printer_name,
const LPCWSTR job_name,
const LPCWSTR output_file_name,
HANDLE progress_event,
HANDLE completion_event,
- UINT8 *printable_pages_on,
+ UINT8* printable_pages_on,
UINT32 printable_pages_on_count,
- IXpsPrintJob **xps_print_job,
- IXpsPrintJobStream **document_stream,
- IXpsPrintJobStream **print_ticket_stream);
+ IXpsPrintJob** xps_print_job,
+ IXpsPrintJobStream** document_stream,
+ IXpsPrintJobStream** print_ticket_stream);
PTOpenProviderProc g_open_provider_proc = NULL;
PTGetPrintCapabilitiesProc g_get_print_capabilities_proc = NULL;
@@ -107,7 +108,7 @@
return reinterpret_cast<const DRIVER_INFO_6*>(buffer->get());
}
-}
+} // namespace
namespace printing {
@@ -172,13 +173,13 @@
HRESULT XPSModule::OpenProvider(const string16& printer_name,
DWORD version,
- HPTPROVIDER *provider) {
+ HPTPROVIDER* provider) {
return g_open_provider_proc(printer_name.c_str(), version, provider);
}
HRESULT XPSModule::GetPrintCapabilities(HPTPROVIDER provider,
- IStream *print_ticket,
- IStream *capabilities,
+ IStream* print_ticket,
+ IStream* capabilities,
BSTR* error_message) {
return g_get_print_capabilities_proc(provider,
print_ticket,
@@ -204,7 +205,7 @@
EDefaultDevmodeType base_devmode_type,
EPrintTicketScope scope,
ULONG* devmode_byte_count,
- PDEVMODE *devmode,
+ PDEVMODE* devmode,
BSTR* error_message) {
return g_convert_print_ticket_to_devmode_proc(provider,
print_ticket,
@@ -293,11 +294,11 @@
const LPCWSTR output_file_name,
HANDLE progress_event,
HANDLE completion_event,
- UINT8 *printable_pages_on,
+ UINT8* printable_pages_on,
UINT32 printable_pages_on_count,
- IXpsPrintJob **xps_print_job,
- IXpsPrintJobStream **document_stream,
- IXpsPrintJobStream **print_ticket_stream) {
+ IXpsPrintJob** xps_print_job,
+ IXpsPrintJobStream** document_stream,
+ IXpsPrintJobStream** print_ticket_stream) {
return g_start_xps_print_job_proc(printer_name,
job_name,
output_file_name,
« no previous file with comments | « printing/backend/win_helper.h ('k') | printing/print_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698