| 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 #if defined(OS_LINUX) | 7 #include <stdint.h> |
| 8 #include <fcntl.h> | |
| 9 #endif // defined(OS_LINUX) | |
| 10 | 8 |
| 11 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 12 #include "base/debug/crash_logging.h" | 10 #include "base/debug/crash_logging.h" |
| 13 #include "base/files/file_util.h" | 11 #include "base/files/file_util.h" |
| 14 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
| 15 #include "base/memory/scoped_vector.h" | 13 #include "base/memory/scoped_vector.h" |
| 16 #include "base/path_service.h" | 14 #include "base/path_service.h" |
| 17 #include "base/strings/string16.h" | 15 #include "base/strings/string16.h" |
| 18 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
| 19 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 40 #include "extensions/common/constants.h" | 38 #include "extensions/common/constants.h" |
| 41 #include "gpu/config/gpu_info.h" | 39 #include "gpu/config/gpu_info.h" |
| 42 #include "net/http/http_util.h" | 40 #include "net/http/http_util.h" |
| 43 #include "ui/base/l10n/l10n_util.h" | 41 #include "ui/base/l10n/l10n_util.h" |
| 44 #include "ui/base/layout.h" | 42 #include "ui/base/layout.h" |
| 45 #include "ui/base/resource/resource_bundle.h" | 43 #include "ui/base/resource/resource_bundle.h" |
| 46 | 44 |
| 47 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. | 45 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 48 | 46 |
| 49 #if defined(OS_LINUX) | 47 #if defined(OS_LINUX) |
| 48 #include <fcntl.h> |
| 50 #include "chrome/common/component_flash_hint_file_linux.h" | 49 #include "chrome/common/component_flash_hint_file_linux.h" |
| 51 #endif // defined(OS_LINUX) | 50 #endif // defined(OS_LINUX) |
| 52 | 51 |
| 53 #if defined(OS_WIN) | 52 #if defined(OS_WIN) |
| 54 #include "base/win/registry.h" | 53 #include "base/win/registry.h" |
| 55 #include "base/win/windows_version.h" | 54 #include "base/win/windows_version.h" |
| 56 #endif | 55 #endif |
| 57 | 56 |
| 58 #if !defined(DISABLE_NACL) | 57 #if !defined(DISABLE_NACL) |
| 59 #include "components/nacl/common/nacl_constants.h" | 58 #include "components/nacl/common/nacl_constants.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 78 #endif | 77 #endif |
| 79 | 78 |
| 80 namespace { | 79 namespace { |
| 81 | 80 |
| 82 #if defined(ENABLE_PLUGINS) | 81 #if defined(ENABLE_PLUGINS) |
| 83 #if defined(ENABLE_PDF) | 82 #if defined(ENABLE_PDF) |
| 84 const char kPDFPluginExtension[] = "pdf"; | 83 const char kPDFPluginExtension[] = "pdf"; |
| 85 const char kPDFPluginDescription[] = "Portable Document Format"; | 84 const char kPDFPluginDescription[] = "Portable Document Format"; |
| 86 const char kPDFPluginOutOfProcessMimeType[] = | 85 const char kPDFPluginOutOfProcessMimeType[] = |
| 87 "application/x-google-chrome-pdf"; | 86 "application/x-google-chrome-pdf"; |
| 88 const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE | | 87 const uint32_t kPDFPluginPermissions = |
| 89 ppapi::PERMISSION_DEV; | 88 ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; |
| 90 #endif // defined(ENABLE_PDF) | 89 #endif // defined(ENABLE_PDF) |
| 91 | 90 |
| 92 content::PepperPluginInfo::GetInterfaceFunc g_pdf_get_interface; | 91 content::PepperPluginInfo::GetInterfaceFunc g_pdf_get_interface; |
| 93 content::PepperPluginInfo::PPP_InitializeModuleFunc g_pdf_initialize_module; | 92 content::PepperPluginInfo::PPP_InitializeModuleFunc g_pdf_initialize_module; |
| 94 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_pdf_shutdown_module; | 93 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_pdf_shutdown_module; |
| 95 | 94 |
| 96 #if !defined(DISABLE_NACL) | 95 #if !defined(DISABLE_NACL) |
| 97 content::PepperPluginInfo::GetInterfaceFunc g_nacl_get_interface; | 96 content::PepperPluginInfo::GetInterfaceFunc g_nacl_get_interface; |
| 98 content::PepperPluginInfo::PPP_InitializeModuleFunc g_nacl_initialize_module; | 97 content::PepperPluginInfo::PPP_InitializeModuleFunc g_nacl_initialize_module; |
| 99 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_nacl_shutdown_module; | 98 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_nacl_shutdown_module; |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 #endif | 630 #endif |
| 632 } | 631 } |
| 633 | 632 |
| 634 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { | 633 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { |
| 635 #if defined(ENABLE_EXTENSIONS) | 634 #if defined(ENABLE_EXTENSIONS) |
| 636 return extensions::IsIsolateExtensionsEnabled(); | 635 return extensions::IsIsolateExtensionsEnabled(); |
| 637 #else | 636 #else |
| 638 return false; | 637 return false; |
| 639 #endif | 638 #endif |
| 640 } | 639 } |
| OLD | NEW |