| 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 "chrome/app/chrome_main_delegate.h" | 5 #include "chrome/app/chrome_main_delegate.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 process_type != switches::kServiceProcess; | 677 process_type != switches::kServiceProcess; |
| 678 } | 678 } |
| 679 | 679 |
| 680 bool ChromeMainDelegate::DelaySandboxInitialization( | 680 bool ChromeMainDelegate::DelaySandboxInitialization( |
| 681 const std::string& process_type) { | 681 const std::string& process_type) { |
| 682 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox(). | 682 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox(). |
| 683 // No sandbox needed for relauncher. | 683 // No sandbox needed for relauncher. |
| 684 return process_type == switches::kNaClLoaderProcess || | 684 return process_type == switches::kNaClLoaderProcess || |
| 685 process_type == switches::kRelauncherProcess; | 685 process_type == switches::kRelauncherProcess; |
| 686 } | 686 } |
| 687 #elif defined(OS_POSIX) | 687 #elif defined(OS_POSIX) && !defined(OS_ANDROID) |
| 688 content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { | 688 content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() { |
| 689 #if defined(DISABLE_NACL) | 689 #if defined(DISABLE_NACL) |
| 690 return NULL; | 690 return NULL; |
| 691 #else | 691 #else |
| 692 return new NaClForkDelegate(); | 692 return new NaClForkDelegate(); |
| 693 #endif | 693 #endif |
| 694 } | 694 } |
| 695 | 695 |
| 696 void ChromeMainDelegate::ZygoteForked() { | 696 void ChromeMainDelegate::ZygoteForked() { |
| 697 Profiling::ProcessStarted(); | 697 Profiling::ProcessStarted(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 720 | 720 |
| 721 content::ContentRendererClient* | 721 content::ContentRendererClient* |
| 722 ChromeMainDelegate::CreateContentRendererClient() { | 722 ChromeMainDelegate::CreateContentRendererClient() { |
| 723 return &g_chrome_content_renderer_client.Get(); | 723 return &g_chrome_content_renderer_client.Get(); |
| 724 } | 724 } |
| 725 | 725 |
| 726 content::ContentUtilityClient* | 726 content::ContentUtilityClient* |
| 727 ChromeMainDelegate::CreateContentUtilityClient() { | 727 ChromeMainDelegate::CreateContentUtilityClient() { |
| 728 return &g_chrome_content_utility_client.Get(); | 728 return &g_chrome_content_utility_client.Get(); |
| 729 } | 729 } |
| OLD | NEW |