From 4130d9e2ee756e06aae9861eb4658b0578ee67bd Mon Sep 17 00:00:00 2001 From: "dmaclach@chromium.org" Date: Tue, 22 Mar 2011 05:19:29 +0000 Subject: Getting service process on Mac to handle having things moved/changed underneath it. BUG=74983 TEST=See http://code.google.com/p/chromium/issues/detail?id=74983#c16 Review URL: http://codereview.chromium.org/6660001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78967 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/service_process_util.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'chrome/common/service_process_util.h') diff --git a/chrome/common/service_process_util.h b/chrome/common/service_process_util.h index 5db5225..3906601 100644 --- a/chrome/common/service_process_util.h +++ b/chrome/common/service_process_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -20,8 +20,6 @@ namespace base { class MessageLoopProxy; } -template struct DefaultSingletonTraits; - // Return the IPC channel to connect to the service process. IPC::ChannelHandle GetServiceProcessChannel(); @@ -60,8 +58,8 @@ bool ForceServiceProcessShutdown(const std::string& version, // and this class are shared. class ServiceProcessState { public: - // Returns the singleton instance. - static ServiceProcessState* GetInstance(); + ServiceProcessState(); + ~ServiceProcessState(); // Tries to become the sole service process for the current user data dir. // Returns false if another service process is already running. @@ -89,8 +87,6 @@ class ServiceProcessState { IPC::ChannelHandle GetServiceProcessChannel(); private: - ServiceProcessState(); - ~ServiceProcessState(); #if !defined(OS_MACOSX) // Create the shared memory data for the service process. @@ -121,8 +117,6 @@ class ServiceProcessState { StateData* state_; scoped_ptr shared_mem_service_data_; scoped_ptr autorun_command_line_; - - friend struct DefaultSingletonTraits; }; #endif // CHROME_COMMON_SERVICE_PROCESS_UTIL_H_ -- cgit v1.1