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/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/cpu.h" | 8 #include "base/cpu.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 #include "webkit/plugins/plugin_switches.h" | 39 #include "webkit/plugins/plugin_switches.h" |
40 | 40 |
41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. | 41 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. |
42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
43 | 43 |
44 #if defined(OS_WIN) | 44 #if defined(OS_WIN) |
45 #include "base/win/registry.h" | 45 #include "base/win/registry.h" |
46 #include "base/win/windows_version.h" | 46 #include "base/win/windows_version.h" |
47 #include "sandbox/win/src/sandbox.h" | 47 #include "sandbox/win/src/sandbox.h" |
48 #elif defined(OS_MACOSX) | 48 #elif defined(OS_MACOSX) |
49 #include "chrome/common/chrome_sandbox_type_mac.h" | 49 #include "components/nacl/common/nacl_sandbox_type_mac.h" |
50 #endif | 50 #endif |
51 | 51 |
52 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ | 52 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ |
53 !defined(WIDEVINE_CDM_IS_COMPONENT) | 53 !defined(WIDEVINE_CDM_IS_COMPONENT) |
54 #include "chrome/common/widevine_cdm_constants.h" | 54 #include "chrome/common/widevine_cdm_constants.h" |
55 #endif | 55 #endif |
56 | 56 |
57 namespace { | 57 namespace { |
58 | 58 |
59 const char kPDFPluginMimeType[] = "application/pdf"; | 59 const char kPDFPluginMimeType[] = "application/pdf"; |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 | 482 |
483 DCHECK(false) << "Unknown child process type!"; | 483 DCHECK(false) << "Unknown child process type!"; |
484 return "Unknown"; | 484 return "Unknown"; |
485 } | 485 } |
486 | 486 |
487 #if defined(OS_MACOSX) && !defined(OS_IOS) | 487 #if defined(OS_MACOSX) && !defined(OS_IOS) |
488 bool ChromeContentClient::GetSandboxProfileForSandboxType( | 488 bool ChromeContentClient::GetSandboxProfileForSandboxType( |
489 int sandbox_type, | 489 int sandbox_type, |
490 int* sandbox_profile_resource_id) const { | 490 int* sandbox_profile_resource_id) const { |
491 DCHECK(sandbox_profile_resource_id); | 491 DCHECK(sandbox_profile_resource_id); |
492 if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) { | 492 if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) { |
493 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; | 493 *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE; |
494 return true; | 494 return true; |
495 } | 495 } |
496 return false; | 496 return false; |
497 } | 497 } |
498 | 498 |
499 std::string ChromeContentClient::GetCarbonInterposePath() const { | 499 std::string ChromeContentClient::GetCarbonInterposePath() const { |
500 return std::string(kInterposeLibraryPath); | 500 return std::string(kInterposeLibraryPath); |
501 } | 501 } |
502 #endif | 502 #endif |
503 | 503 |
504 } // namespace chrome | 504 } // namespace chrome |
OLD | NEW |