Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / apps / app_shim / app_shim_host_manager_mac.h

diff --git a/src/apps/app_shim/app_shim_host_manager_mac.h b/src/apps/app_shim/app_shim_host_manager_mac.h
index 4b945eb..037c4f2 100644 (file)
--- a/src/apps/app_shim/app_shim_host_manager_mac.h
+++ b/src/apps/app_shim/app_shim_host_manager_mac.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
-#define CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
+#ifndef APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
+#define APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
+#include "apps/app_shim/unix_domain_socket_acceptor.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/browser_thread.h"
-#include "ipc/ipc_channel_factory.h"
 
 namespace base {
 class FilePath;
@@ -19,11 +19,11 @@ class AppShimHostManagerTestApi;
 }
 
 // The AppShimHostManager receives connections from app shims on a UNIX
-// socket (|factory_|) and creates a helper object to manage the connection.
-class AppShimHostManager
-    : public IPC::ChannelFactory::Delegate,
-      public base::RefCountedThreadSafe<
-          AppShimHostManager, content::BrowserThread::DeleteOnUIThread> {
+// socket (|acceptor_|) and creates a helper object to manage the connection.
+class AppShimHostManager : public apps::UnixDomainSocketAcceptor::Delegate,
+                           public base::RefCountedThreadSafe<
+                               AppShimHostManager,
+                               content::BrowserThread::DeleteOnUIThread> {
  public:
   AppShimHostManager();
 
@@ -44,11 +44,11 @@ class AppShimHostManager
   friend class test::AppShimHostManagerTestApi;
   virtual ~AppShimHostManager();
 
-  // IPC::ChannelFactory::Delegate implementation.
+  // UnixDomainSocketAcceptor::Delegate implementation.
   virtual void OnClientConnected(const IPC::ChannelHandle& handle) OVERRIDE;
   virtual void OnListenError() OVERRIDE;
 
-  // The |factory_| must be created on a thread which allows blocking I/O, so
+  // The |acceptor_| must be created on a thread which allows blocking I/O, so
   // part of the initialization of this class must be carried out on the file
   // thread.
   void InitOnFileThread();
@@ -56,13 +56,18 @@ class AppShimHostManager
   // Called on the IO thread to begin listening for connections from app shims.
   void ListenOnIOThread();
 
+  // The AppShimHostManager is only initialized if the Chrome process
+  // successfully took the singleton lock. This prevents subsequent processes
+  // from deleting existing app shim socket files.
+  bool did_init_;
+
   base::FilePath directory_in_tmp_;
 
-  scoped_ptr<IPC::ChannelFactory> factory_;
+  scoped_ptr<apps::UnixDomainSocketAcceptor> acceptor_;
 
   apps::ExtensionAppShimHandler extension_app_shim_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(AppShimHostManager);
 };
 
-#endif  // CHROME_BROWSER_WEB_APPLICATIONS_APP_SHIM_HOST_MANAGER_MAC_H_
+#endif  // APPS_APP_SHIM_APP_SHIM_HOST_MANAGER_MAC_H_