Update debugd client.

chromeos/dbus/debug_daemon_client.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 "chromeos/dbus/debug_daemon_client.h"
 
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
@@ skipping 448 matching lines @@
       sub_writer.CloseContainer(&elem_writer);
     }
     writer.CloseContainer(&sub_writer);
 
     debugdaemon_proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&DebugDaemonClientImpl::OnSetOomScoreAdj,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
-  void CupsAddPrinter(const std::string& name,
-                      const std::string& uri,
-                      const std::string& ppd_path,
-                      bool ipp_everywhere,
-                      const DebugDaemonClient::CupsAddPrinterCallback& callback,
-                      const base::Closure& error_callback) override {
+  void CupsAddPrinter(
+      const std::string& name,
+      const std::string& uri,
+      const std::string& ppd_path,
+      bool ipp_everywhere,
+      const DebugDaemonClient::LegacyCupsAddPrinterCallback& callback,
+      const base::Closure& error_callback) override {
     dbus::MethodCall method_call(debugd::kDebugdInterface,
                                  debugd::kCupsAddPrinter);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
     writer.AppendString(uri);
     writer.AppendString(ppd_path);
     writer.AppendBool(ipp_everywhere);
 
     debugdaemon_proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&DebugDaemonClientImpl::LegacyOnPrinterAdded,
+                   weak_ptr_factory_.GetWeakPtr(), callback, error_callback));
+  }
+
+  void CupsAddManuallyConfiguredPrinter(
+      const std::string& name,
+      const std::string& uri,
+      const std::string& ppd_contents,
+      const DebugDaemonClient::CupsAddPrinterCallback& callback,
+      const base::Closure& error_callback) override {
+    dbus::MethodCall method_call(debugd::kDebugdInterface,
+                                 debugd::kCupsAddManuallyConfiguredPrinter);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(name);
+    writer.AppendString(uri);
+    writer.AppendString(ppd_contents);
+
+    debugdaemon_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&DebugDaemonClientImpl::OnPrinterAdded,
                    weak_ptr_factory_.GetWeakPtr(), callback, error_callback));
   }
+
+  void CupsAddAutoConfiguredPrinter(
+      const std::string& name,
+      const std::string& uri,
+      const DebugDaemonClient::CupsAddPrinterCallback& callback,
+      const base::Closure& error_callback) override {
+    dbus::MethodCall method_call(debugd::kDebugdInterface,
+                                 debugd::kCupsAddAutoConfiguredPrinter);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendString(name);
+    writer.AppendString(uri);
+
+    debugdaemon_proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&DebugDaemonClientImpl::OnPrinterAdded,
+                   weak_ptr_factory_.GetWeakPtr(), callback, error_callback));
+  }
 
   void CupsRemovePrinter(
       const std::string& name,
       const DebugDaemonClient::CupsRemovePrinterCallback& callback,
       const base::Closure& error_callback) override {
     dbus::MethodCall method_call(debugd::kDebugdInterface,
                                  debugd::kCupsRemovePrinter);
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(name);
 
@@ skipping 208 matching lines @@
 
   void OnSetOomScoreAdj(const SetOomScoreAdjCallback& callback,
                         dbus::Response* response) {
     std::string output;
     if (response && dbus::MessageReader(response).PopString(&output))
       callback.Run(true, output);
     else
       callback.Run(false, "");
   }
 
-  void OnPrinterAdded(const CupsAddPrinterCallback& callback,
-                      const base::Closure& error_callback,
-                      dbus::Response* response) {
+  void LegacyOnPrinterAdded(const LegacyCupsAddPrinterCallback& callback,
+                            const base::Closure& error_callback,
+                            dbus::Response* response) {
     bool result = false;
     dbus::MessageReader reader(response);
     if (response && reader.PopBool(&result)) {
       callback.Run(result);
     } else {
       error_callback.Run();
+    }
+  }
+
+  void OnPrinterAdded(const CupsAddPrinterCallback& callback,
+                      const base::Closure& error_callback,
+                      dbus::Response* response) {
+    int32_t result;
+    dbus::MessageReader reader(response);
+    if (response && reader.PopInt32(&result)) {
+      callback.Run(result);
+    } else {
+      error_callback.Run();
     }
   }
 
   void OnPrinterRemoved(const CupsRemovePrinterCallback& callback,
                         const base::Closure& error_callback,
                         dbus::Response* response) {
     bool result = false;
     dbus::MessageReader reader(response);
     if (response && reader.PopBool(&result)) {
       callback.Run(result);
@@ skipping 22 matching lines @@
 DebugDaemonClient::EmptyStopAgentTracingCallback() {
   return base::Bind(&EmptyStopAgentTracingCallbackBody);
 }
 
 // static
 DebugDaemonClient* DebugDaemonClient::Create() {
   return new DebugDaemonClientImpl();
 }
 
 }  // namespace chromeos