Refactor the daemon controller so that the callbacks are called on the caller thread.

remoting/host/setup/daemon_controller_delegate_mac.h

Index: remoting/host/setup/daemon_controller_delegate_mac.h
diff --git a/remoting/host/setup/daemon_controller_delegate_mac.h b/remoting/host/setup/daemon_controller_delegate_mac.h
new file mode 100644
index 0000000000000000000000000000000000000000..8e4bfefe0b50741e51666cdb69347caa9048cd59
--- /dev/null
+++ b/remoting/host/setup/daemon_controller_delegate_mac.h
@@ -0,0 +1,56 @@
+// Copyright 2013 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 REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_MAC_H_
+#define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_MAC_H_
+
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
+#include "remoting/host/setup/daemon_controller.h"
+
+namespace remoting {
+
+class DaemonControllerDelegateMac : public DaemonController::Delegate {
+ public:
+  DaemonControllerDelegateMac();
+  virtual ~DaemonControllerDelegateMac();
+
+  // DaemonController::Delegate interface.
+  virtual DaemonController::State GetState() OVERRIDE;
+  virtual scoped_ptr<base::DictionaryValue> GetConfig() OVERRIDE;
+  virtual void SetConfigAndStart(
+      scoped_ptr<base::DictionaryValue> config,
+      bool consent,
+      const DaemonController::CompletionCallback& done) OVERRIDE;
+  virtual void UpdateConfig(
+      scoped_ptr<base::DictionaryValue> config,
+      const DaemonController::CompletionCallback& done) OVERRIDE;
+  virtual void Stop(const DaemonController::CompletionCallback& done) OVERRIDE;
+  virtual void SetWindow(void* window_handle) OVERRIDE;
+  virtual std::string GetVersion() OVERRIDE;
+  virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() OVERRIDE;
+
+ private:
+  void ShowPreferencePane(const std::string& config_data,
+                          const DaemonController::CompletionCallback& done);
+  void RegisterForPreferencePaneNotifications(
+      const DaemonController::CompletionCallback &done);
+  void DeregisterForPreferencePaneNotifications();
+  void PreferencePaneCallbackDelegate(CFStringRef name);
+
+  static bool DoShowPreferencePane(const std::string& config_data);
+  static void PreferencePaneCallback(CFNotificationCenterRef center,
+                                     void* observer,
+                                     CFStringRef name,
+                                     const void* object,
+                                     CFDictionaryRef user_info);
+
+  DaemonController::CompletionCallback current_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(DaemonControllerDelegateMac);
+};
+
+}  // namespace remoting
+
+#endif  // REMOTING_HOST_SETUP_DAEMON_CONTROLLER_DELEGATE_MAC_H_