| OLD | NEW | 
|    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #ifndef CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ |    5 #ifndef CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ | 
|    6 #define CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ |    6 #define CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ | 
|    7  |    7  | 
|    8 #include <memory> |    8 #include <memory> | 
|    9  |    9  | 
|   10 #include "base/macros.h" |   10 #include "base/macros.h" | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  129   // Sets the files that should be mapped when a new child process is created |  129   // Sets the files that should be mapped when a new child process is created | 
|  130   // for the service |service_name|. |  130   // for the service |service_name|. | 
|  131   static void SetRegisteredFilesForService( |  131   static void SetRegisteredFilesForService( | 
|  132       const std::string& service_name, |  132       const std::string& service_name, | 
|  133       catalog::RequiredFileMap required_files); |  133       catalog::RequiredFileMap required_files); | 
|  134  |  134  | 
|  135   // Resets all files registered by |SetRegisteredFilesForService|. Used to |  135   // Resets all files registered by |SetRegisteredFilesForService|. Used to | 
|  136   // support multiple shell context creation in unit_tests. |  136   // support multiple shell context creation in unit_tests. | 
|  137   static void ResetRegisteredFilesForTesting(); |  137   static void ResetRegisteredFilesForTesting(); | 
|  138  |  138  | 
 |  139 #if defined(OS_ANDROID) | 
 |  140   // Temporary until crbug.com/693484 is fixed. | 
 |  141   static size_t GetNumberOfRendererSlots(); | 
 |  142 #endif  // OS_ANDROID | 
 |  143  | 
|  139  private: |  144  private: | 
|  140   friend class internal::ChildProcessLauncherHelper; |  145   friend class internal::ChildProcessLauncherHelper; | 
|  141  |  146  | 
|  142   void UpdateTerminationStatus(bool known_dead); |  147   void UpdateTerminationStatus(bool known_dead); | 
|  143  |  148  | 
|  144   // Notifies the client about the result of the operation. |  149   // Notifies the client about the result of the operation. | 
|  145   void Notify(internal::ChildProcessLauncherHelper::Process process, |  150   void Notify(internal::ChildProcessLauncherHelper::Process process, | 
|  146               mojo::edk::ScopedPlatformHandle server_handle, |  151               mojo::edk::ScopedPlatformHandle server_handle, | 
|  147               int error_code); |  152               int error_code); | 
|  148  |  153  | 
| (...skipping 17 matching lines...) Expand all  Loading... | 
|  166   scoped_refptr<internal::ChildProcessLauncherHelper> helper_; |  171   scoped_refptr<internal::ChildProcessLauncherHelper> helper_; | 
|  167  |  172  | 
|  168   base::WeakPtrFactory<ChildProcessLauncher> weak_factory_; |  173   base::WeakPtrFactory<ChildProcessLauncher> weak_factory_; | 
|  169  |  174  | 
|  170   DISALLOW_COPY_AND_ASSIGN(ChildProcessLauncher); |  175   DISALLOW_COPY_AND_ASSIGN(ChildProcessLauncher); | 
|  171 }; |  176 }; | 
|  172  |  177  | 
|  173 }  // namespace content |  178 }  // namespace content | 
|  174  |  179  | 
|  175 #endif  // CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ |  180 #endif  // CONTENT_BROWSER_CHILD_PROCESS_LAUNCHER_H_ | 
| OLD | NEW |