| 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 #include "content/public/app/content_main_runner.h" | 5 #include "content/public/app/content_main_runner.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <string.h> | 9 #include <string.h> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 // - The ipc_fd is passed through the Java service. | 447 // - The ipc_fd is passed through the Java service. |
| 448 // Thus, these are all disabled. | 448 // Thus, these are all disabled. |
| 449 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 449 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 450 // Set C library locale to make sure CommandLine can parse argument values | 450 // Set C library locale to make sure CommandLine can parse argument values |
| 451 // in correct encoding. | 451 // in correct encoding. |
| 452 setlocale(LC_ALL, ""); | 452 setlocale(LC_ALL, ""); |
| 453 | 453 |
| 454 SetupSignalHandlers(); | 454 SetupSignalHandlers(); |
| 455 g_fds->Set(kPrimaryIPCChannel, | 455 g_fds->Set(kPrimaryIPCChannel, |
| 456 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); | 456 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); |
| 457 g_fds->Set(kMojoIPCChannel, |
| 458 kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor); |
| 457 #endif // !OS_ANDROID && !OS_IOS | 459 #endif // !OS_ANDROID && !OS_IOS |
| 458 | 460 |
| 459 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 461 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
| 460 g_fds->Set(kCrashDumpSignal, | 462 g_fds->Set(kCrashDumpSignal, |
| 461 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); | 463 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); |
| 462 #endif // OS_LINUX || OS_OPENBSD | 464 #endif // OS_LINUX || OS_OPENBSD |
| 463 | 465 |
| 464 | 466 |
| 465 #endif // !OS_WIN | 467 #endif // !OS_WIN |
| 466 | 468 |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 | 813 |
| 812 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 814 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 813 }; | 815 }; |
| 814 | 816 |
| 815 // static | 817 // static |
| 816 ContentMainRunner* ContentMainRunner::Create() { | 818 ContentMainRunner* ContentMainRunner::Create() { |
| 817 return new ContentMainRunnerImpl(); | 819 return new ContentMainRunnerImpl(); |
| 818 } | 820 } |
| 819 | 821 |
| 820 } // namespace content | 822 } // namespace content |
| OLD | NEW |