| 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 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 // - The ipc_fd is passed through the Java service. | 459 // - The ipc_fd is passed through the Java service. |
| 460 // Thus, these are all disabled. | 460 // Thus, these are all disabled. |
| 461 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 461 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 462 // Set C library locale to make sure CommandLine can parse argument values | 462 // Set C library locale to make sure CommandLine can parse argument values |
| 463 // in correct encoding. | 463 // in correct encoding. |
| 464 setlocale(LC_ALL, ""); | 464 setlocale(LC_ALL, ""); |
| 465 | 465 |
| 466 SetupSignalHandlers(); | 466 SetupSignalHandlers(); |
| 467 g_fds->Set(kPrimaryIPCChannel, | 467 g_fds->Set(kPrimaryIPCChannel, |
| 468 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); | 468 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor); |
| 469 g_fds->Set(kMojoIPCChannel, | |
| 470 kMojoIPCChannel + base::GlobalDescriptors::kBaseDescriptor); | |
| 471 #endif // !OS_ANDROID && !OS_IOS | 469 #endif // !OS_ANDROID && !OS_IOS |
| 472 | 470 |
| 473 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 471 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
| 474 g_fds->Set(kCrashDumpSignal, | 472 g_fds->Set(kCrashDumpSignal, |
| 475 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); | 473 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); |
| 476 #endif // OS_LINUX || OS_OPENBSD | 474 #endif // OS_LINUX || OS_OPENBSD |
| 477 | 475 |
| 478 | 476 |
| 479 #endif // !OS_WIN | 477 #endif // !OS_WIN |
| 480 | 478 |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 | 823 |
| 826 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 824 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
| 827 }; | 825 }; |
| 828 | 826 |
| 829 // static | 827 // static |
| 830 ContentMainRunner* ContentMainRunner::Create() { | 828 ContentMainRunner* ContentMainRunner::Create() { |
| 831 return new ContentMainRunnerImpl(); | 829 return new ContentMainRunnerImpl(); |
| 832 } | 830 } |
| 833 | 831 |
| 834 } // namespace content | 832 } // namespace content |
| OLD | NEW |