| 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/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 SuppressWindowsErrorDialogs(); | 803 SuppressWindowsErrorDialogs(); |
| 804 #endif | 804 #endif |
| 805 | 805 |
| 806 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER) | 806 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 807 #if !defined(DISABLE_NACL) | 807 #if !defined(DISABLE_NACL) |
| 808 ChromeContentClient::SetNaClEntryFunctions( | 808 ChromeContentClient::SetNaClEntryFunctions( |
| 809 nacl_plugin::PPP_GetInterface, | 809 nacl_plugin::PPP_GetInterface, |
| 810 nacl_plugin::PPP_InitializeModule, | 810 nacl_plugin::PPP_InitializeModule, |
| 811 nacl_plugin::PPP_ShutdownModule); | 811 nacl_plugin::PPP_ShutdownModule); |
| 812 #endif | 812 #endif |
| 813 #if defined(ENABLE_PLUGINS) | 813 #if defined(ENABLE_PLUGINS) && defined(ENABLE_PDF) |
| 814 ChromeContentClient::SetPDFEntryFunctions( | 814 ChromeContentClient::SetPDFEntryFunctions( |
| 815 chrome_pdf::PPP_GetInterface, | 815 chrome_pdf::PPP_GetInterface, |
| 816 chrome_pdf::PPP_InitializeModule, | 816 chrome_pdf::PPP_InitializeModule, |
| 817 chrome_pdf::PPP_ShutdownModule); | 817 chrome_pdf::PPP_ShutdownModule); |
| 818 #endif | 818 #endif |
| 819 #endif | 819 #endif |
| 820 } | 820 } |
| 821 | 821 |
| 822 int ChromeMainDelegate::RunProcess( | 822 int ChromeMainDelegate::RunProcess( |
| 823 const std::string& process_type, | 823 const std::string& process_type, |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 case version_info::Channel::CANARY: | 965 case version_info::Channel::CANARY: |
| 966 return true; | 966 return true; |
| 967 case version_info::Channel::DEV: | 967 case version_info::Channel::DEV: |
| 968 case version_info::Channel::BETA: | 968 case version_info::Channel::BETA: |
| 969 case version_info::Channel::STABLE: | 969 case version_info::Channel::STABLE: |
| 970 default: | 970 default: |
| 971 // Don't enable instrumentation. | 971 // Don't enable instrumentation. |
| 972 return false; | 972 return false; |
| 973 } | 973 } |
| 974 } | 974 } |
| OLD | NEW |