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); |
469 #endif // !OS_ANDROID && !OS_IOS | 471 #endif // !OS_ANDROID && !OS_IOS |
470 | 472 |
471 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 473 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
472 g_fds->Set(kCrashDumpSignal, | 474 g_fds->Set(kCrashDumpSignal, |
473 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); | 475 kCrashDumpSignal + base::GlobalDescriptors::kBaseDescriptor); |
474 #endif // OS_LINUX || OS_OPENBSD | 476 #endif // OS_LINUX || OS_OPENBSD |
475 | 477 |
476 | 478 |
477 #endif // !OS_WIN | 479 #endif // !OS_WIN |
478 | 480 |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
823 | 825 |
824 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); | 826 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); |
825 }; | 827 }; |
826 | 828 |
827 // static | 829 // static |
828 ContentMainRunner* ContentMainRunner::Create() { | 830 ContentMainRunner* ContentMainRunner::Create() { |
829 return new ContentMainRunnerImpl(); | 831 return new ContentMainRunnerImpl(); |
830 } | 832 } |
831 | 833 |
832 } // namespace content | 834 } // namespace content |
OLD | NEW |