| Index: chrome/common/chrome_utility_messages.h
|
| diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h
|
| index b706ee545cf0ea7edc3b6b0f6cc3c725178e7d85..66e19b498bfc1d293b997d4ee87a5e2f43bddbea 100644
|
| --- a/chrome/common/chrome_utility_messages.h
|
| +++ b/chrome/common/chrome_utility_messages.h
|
| @@ -21,10 +21,6 @@
|
| #include "chrome/common/safe_browsing/zip_analyzer.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ipc/ipc_platform_file.h"
|
| -#include "printing/backend/print_backend.h"
|
| -#include "printing/page_range.h"
|
| -#include "printing/pdf_render_settings.h"
|
| -#include "printing/pwg_raster_settings.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
|
|
| #define IPC_MESSAGE_START ChromeUtilityMsgStart
|
| @@ -36,50 +32,6 @@ typedef std::vector<Tuple2<SkBitmap, base::FilePath> > DecodedImages;
|
|
|
| #endif // CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(printing::PageRange)
|
| - IPC_STRUCT_TRAITS_MEMBER(from)
|
| - IPC_STRUCT_TRAITS_MEMBER(to)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| -IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults)
|
| - IPC_STRUCT_TRAITS_MEMBER(printer_capabilities)
|
| - IPC_STRUCT_TRAITS_MEMBER(caps_mime_type)
|
| - IPC_STRUCT_TRAITS_MEMBER(printer_defaults)
|
| - IPC_STRUCT_TRAITS_MEMBER(defaults_mime_type)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| -IPC_ENUM_TRAITS_MAX_VALUE(printing::ColorModel, printing::PROCESSCOLORMODEL_RGB)
|
| -IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE)
|
| -
|
| -IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper)
|
| - IPC_STRUCT_TRAITS_MEMBER(name)
|
| - IPC_STRUCT_TRAITS_MEMBER(size_um)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| -IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults)
|
| - IPC_STRUCT_TRAITS_MEMBER(collate_capable)
|
| - IPC_STRUCT_TRAITS_MEMBER(collate_default)
|
| - IPC_STRUCT_TRAITS_MEMBER(copies_capable)
|
| - IPC_STRUCT_TRAITS_MEMBER(duplex_capable)
|
| - IPC_STRUCT_TRAITS_MEMBER(duplex_default)
|
| - IPC_STRUCT_TRAITS_MEMBER(color_changeable)
|
| - IPC_STRUCT_TRAITS_MEMBER(color_default)
|
| - IPC_STRUCT_TRAITS_MEMBER(color_model)
|
| - IPC_STRUCT_TRAITS_MEMBER(bw_model)
|
| - IPC_STRUCT_TRAITS_MEMBER(papers)
|
| - IPC_STRUCT_TRAITS_MEMBER(default_paper)
|
| - IPC_STRUCT_TRAITS_MEMBER(dpis)
|
| - IPC_STRUCT_TRAITS_MEMBER(default_dpi)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| -IPC_ENUM_TRAITS(printing::PwgRasterTransformType);
|
| -
|
| -IPC_STRUCT_TRAITS_BEGIN(printing::PwgRasterSettings)
|
| - IPC_STRUCT_TRAITS_MEMBER(odd_page_transform)
|
| - IPC_STRUCT_TRAITS_MEMBER(rotate_all_pages)
|
| - IPC_STRUCT_TRAITS_MEMBER(reverse_page_order)
|
| -IPC_STRUCT_TRAITS_END()
|
| -
|
| IPC_STRUCT_TRAITS_BEGIN(UpdateManifest::Result)
|
| IPC_STRUCT_TRAITS_MEMBER(extension_id)
|
| IPC_STRUCT_TRAITS_MEMBER(version)
|
| @@ -180,23 +132,6 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_DecodeImage,
|
| IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_DecodeImageBase64,
|
| std::string) // base64 encoded image contents
|
|
|
| -// Tell the utility process to render the given PDF into a metafile.
|
| -// The metafile path will have ".%d" inserted where the %d is the page number.
|
| -// If no page range is specified, all pages will be converted.
|
| -IPC_MESSAGE_CONTROL4(ChromeUtilityMsg_RenderPDFPagesToMetafiles,
|
| - IPC::PlatformFileForTransit, // PDF file
|
| - base::FilePath, // Base location for output metafile
|
| - printing::PdfRenderSettings, // PDF render settings
|
| - std::vector<printing::PageRange>)
|
| -
|
| -// Tell the utility process to render the given PDF into a PWGRaster.
|
| -IPC_MESSAGE_CONTROL4(ChromeUtilityMsg_RenderPDFPagesToPWGRaster,
|
| - IPC::PlatformFileForTransit, /* Input PDF file */
|
| - printing::PdfRenderSettings, /* PDF render settings */
|
| - // PWG transform settings.
|
| - printing::PwgRasterSettings,
|
| - IPC::PlatformFileForTransit /* Output PWG file */)
|
| -
|
| // Tell the utility process to decode the given JPEG image data with a robust
|
| // libjpeg codec.
|
| IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_RobustJPEGDecodeImage,
|
| @@ -206,20 +141,6 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_RobustJPEGDecodeImage,
|
| IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_ParseJSON,
|
| std::string /* JSON to parse */)
|
|
|
| -// Tells the utility process to get capabilities and defaults for the specified
|
| -// printer. Used on Windows to isolate the service process from printer driver
|
| -// crashes by executing this in a separate process. This does not run in a
|
| -// sandbox.
|
| -IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_GetPrinterCapsAndDefaults,
|
| - std::string /* printer name */)
|
| -
|
| -// Tells the utility process to get capabilities and defaults for the specified
|
| -// printer. Used on Windows to isolate the service process from printer driver
|
| -// crashes by executing this in a separate process. This does not run in a
|
| -// sandbox. Returns result as printing::PrinterSemanticCapsAndDefaults.
|
| -IPC_MESSAGE_CONTROL1(ChromeUtilityMsg_GetPrinterSemanticCapsAndDefaults,
|
| - std::string /* printer name */)
|
| -
|
| // Tell the utility process to patch the given |input_file| using |patch_file|
|
| // and place the output in |output_file|. The patch should use the bsdiff
|
| // algorithm (Courgette's version).
|
| @@ -369,20 +290,6 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_DecodeImage_Succeeded,
|
| // Reply when an error occurred decoding the image.
|
| IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_DecodeImage_Failed)
|
|
|
| -// Reply when the utility process has succeeded in rendering the PDF.
|
| -IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_RenderPDFPagesToMetafiles_Succeeded,
|
| - std::vector<printing::PageRange>, // Pages rendered
|
| - double) // Scale factor
|
| -
|
| -// Reply when an error occurred rendering the PDF.
|
| -IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_RenderPDFPagesToMetafile_Failed)
|
| -
|
| -// Reply when the utility process has succeeded in rendering the PDF to PWG.
|
| -IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_RenderPDFPagesToPWGRaster_Succeeded)
|
| -
|
| -// Reply when an error occurred rendering the PDF to PWG.
|
| -IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_RenderPDFPagesToPWGRaster_Failed)
|
| -
|
| // Reply when the utility process successfully parsed a JSON string.
|
| //
|
| // WARNING: The result can be of any Value subclass type, but we can't easily
|
| @@ -396,21 +303,6 @@ IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseJSON_Succeeded,
|
| IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_ParseJSON_Failed,
|
| std::string /* error message, if any*/)
|
|
|
| -#if defined(ENABLE_FULL_PRINTING)
|
| -// Reply when the utility process has succeeded in obtaining the printer
|
| -// capabilities and defaults.
|
| -IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded,
|
| - std::string /* printer name */,
|
| - printing::PrinterCapsAndDefaults)
|
| -
|
| -// Reply when the utility process has succeeded in obtaining the printer
|
| -// semantic capabilities and defaults.
|
| -IPC_MESSAGE_CONTROL2(
|
| - ChromeUtilityHostMsg_GetPrinterSemanticCapsAndDefaults_Succeeded,
|
| - std::string /* printer name */,
|
| - printing::PrinterSemanticCapsAndDefaults)
|
| -#endif
|
| -
|
| // Reply when a file has been patched successfully.
|
| IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_PatchFile_Succeeded)
|
|
|
| @@ -418,17 +310,6 @@ IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_PatchFile_Succeeded)
|
| IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_PatchFile_Failed,
|
| int /* error code */)
|
|
|
| -// Reply when the utility process has failed to obtain the printer
|
| -// capabilities and defaults.
|
| -IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_GetPrinterCapsAndDefaults_Failed,
|
| - std::string /* printer name */)
|
| -
|
| -// Reply when the utility process has failed to obtain the printer
|
| -// semantic capabilities and defaults.
|
| -IPC_MESSAGE_CONTROL1(
|
| - ChromeUtilityHostMsg_GetPrinterSemanticCapsAndDefaults_Failed,
|
| - std::string /* printer name */)
|
| -
|
| #if defined(OS_CHROMEOS)
|
| // Reply when the utility process has succeeded in creating the zip file.
|
| IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_CreateZipFile_Succeeded)
|
|
|