Implement asynchronous interface/plumbing for GetDefaultPrintSettings.

ppapi/cpp/dev/printing_dev.cc

 // 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.
 
 #include "ppapi/cpp/dev/printing_dev.h"
 
 #include "ppapi/c/dev/ppb_printing_dev.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 static const char kPPPPrintingInterface[] = PPP_PRINTING_DEV_INTERFACE;
 
+template <> const char* interface_name<PPB_Printing_Dev_0_7>() {
+  return PPB_PRINTING_DEV_INTERFACE_0_7;
+}
+
 template <> const char* interface_name<PPB_Printing_Dev_0_6>() {
   return PPB_PRINTING_DEV_INTERFACE_0_6;
 }
 
 uint32_t QuerySupportedFormats(PP_Instance instance) {
   void* object =
       Instance::GetPerInstanceObject(instance, kPPPPrintingInterface);
   if (!object)
     return 0;
   return static_cast<Printing_Dev*>(object)->QuerySupportedPrintOutputFormats();
@@ skipping 52 matching lines @@
   instance->AddPerInstanceObject(kPPPPrintingInterface, this);
 }
 
 Printing_Dev::~Printing_Dev() {
   Instance::RemovePerInstanceObject(associated_instance_,
                                     kPPPPrintingInterface, this);
 }
 
 // static
 bool Printing_Dev::IsAvailable() {
-  return has_interface<PPB_Printing_Dev_0_6>();
+  return has_interface<PPB_Printing_Dev_0_7>() ||
+      has_interface<PPB_Printing_Dev_0_6>();
 }
 
 bool Printing_Dev::GetDefaultPrintSettings(
     PP_PrintSettings_Dev* print_settings) const {
   if (!has_interface<PPB_Printing_Dev_0_6>())
     return false;
   return PP_ToBool(
       get_interface<PPB_Printing_Dev_0_6>()->GetDefaultPrintSettings(
           associated_instance_.pp_instance(), print_settings));
 }
 
+int32_t Printing_Dev::GetDefaultPrintSettings(
+    PP_PrintSettings_Dev* print_settings,
+    const CompletionCallback& callback) const {
+  if (!has_interface<PPB_Printing_Dev_0_7>())
+    return PP_ERROR_NOTSUPPORTED;
+  return get_interface<PPB_Printing_Dev_0_7>()->GetDefaultPrintSettings(
+      associated_instance_.pp_instance(), print_settings,
+      callback.pp_completion_callback());

[dmichael (off chromium), 2012/07/23 18:20:09]

You might want to check with Trung about this. If Flash is using PPB_Printing,
we might need to make this method work with 0.6 *and* 0.7 (if possible), so that
a new version of Flapper can get pushed to an older version of Chrome (where
only 0.6 is supported).

It'll be ugly if you have to support that, but *may* be possible with
CallOnMainThread or something.

[raymes, 2012/07/24 00:37:08]

Good call. I updated the CL with your suggestion and I'll get Trungs thoughts
about it first.

+}
+
 }  // namespace pp