Include driver infor into PrinterBasicInfo.

printing/backend/win_helper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PRINTING_BACKEND_WIN_HELPER_H_
 #define PRINTING_BACKEND_WIN_HELPER_H_
 #pragma once
 
 #include <objidl.h>
 #include <winspool.h>
 #include <prntvpt.h>
 #include <xpsprint.h>
 
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/win/scoped_handle.h"
 #include "printing/printing_export.h"
 
 // These are helper functions for dealing with Windows Printing.
 namespace printing {
 
+struct PRINTING_EXPORT PrinterBasicInfo;
+
 class PrinterHandleTraits {
  public:
   typedef HANDLE Handle;
 
   static bool CloseHandle(HANDLE handle) {
     return ::ClosePrinter(handle) != FALSE;
   }
 
   static bool IsHandleValid(HANDLE handle) {
     return handle != NULL;
@@ skipping 82 matching lines @@
       UINT8 *printable_pages_on,
       UINT32 printable_pages_on_count,
       IXpsPrintJob **xps_print_job,
       IXpsPrintJobStream **document_stream,
       IXpsPrintJobStream **print_ticket_stream);
  private:
   XPSPrintModule() { }
   static bool InitImpl();
 };
 
+PRINTING_EXPORT const PRINTER_INFO_2* GetPrinterInfo2(

[gene, 2012/03/21 21:07:22]

Could you please create a simple class representing PRINTER_INFO_2? Current API
is pretty confusing.

[Vitaly Buka (NO REVIEWS), 2012/03/21 21:23:01]

need to talk about that

On 2012/03/21 21:07:22, gene wrote:

+    HANDLE printer,
+    scoped_array<BYTE>* buffer);
+
+PRINTING_EXPORT const DRIVER_INFO_6* GetDriverInfo6(

[gene, 2012/03/21 21:07:22]

Could you please create a simple class representing DRIVER_INFO_6? Current API
is pretty confusing.

[Vitaly Buka (NO REVIEWS), 2012/03/21 21:23:01]

need to talk about that

On 2012/03/21 21:07:22, gene wrote:

+    HANDLE printer,
+    scoped_array<BYTE>* buffer);
+
+PRINTING_EXPORT void InitBasicPrinterInfo(
+    const PRINTER_INFO_2* printer,
+    const DRIVER_INFO_6* driver,
+    printing::PrinterBasicInfo* printer_info);
+
+PRINTING_EXPORT std::string GetDriverInfo(const DRIVER_INFO_6* driver);
+
 }  // namespace printing
 
 #endif  // PRINTING_BACKEND_WIN_HELPER_H_