| 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 22 matching lines...) Expand all Loading... |
| 33 #include "ui/base/resource/resource_bundle.h" | 33 #include "ui/base/resource/resource_bundle.h" |
| 34 #include "webkit/glue/user_agent.h" | 34 #include "webkit/glue/user_agent.h" |
| 35 #include "webkit/plugins/npapi/plugin_list.h" | 35 #include "webkit/plugins/npapi/plugin_list.h" |
| 36 #include "webkit/plugins/plugin_constants.h" | 36 #include "webkit/plugins/plugin_constants.h" |
| 37 | 37 |
| 38 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. | 38 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. |
| 39 | 39 |
| 40 #if defined(OS_WIN) | 40 #if defined(OS_WIN) |
| 41 #include "base/win/registry.h" | 41 #include "base/win/registry.h" |
| 42 #include "base/win/windows_version.h" | 42 #include "base/win/windows_version.h" |
| 43 #include "sandbox/src/sandbox.h" | 43 #include "sandbox/win/src/sandbox.h" |
| 44 #elif defined(OS_MACOSX) | 44 #elif defined(OS_MACOSX) |
| 45 #include "chrome/common/chrome_sandbox_type_mac.h" | 45 #include "chrome/common/chrome_sandbox_type_mac.h" |
| 46 #endif | 46 #endif |
| 47 | 47 |
| 48 namespace { | 48 namespace { |
| 49 | 49 |
| 50 const char kPDFPluginName[] = "Chrome PDF Viewer"; | 50 const char kPDFPluginName[] = "Chrome PDF Viewer"; |
| 51 const char kPDFPluginMimeType[] = "application/pdf"; | 51 const char kPDFPluginMimeType[] = "application/pdf"; |
| 52 const char kPDFPluginExtension[] = "pdf"; | 52 const char kPDFPluginExtension[] = "pdf"; |
| 53 const char kPDFPluginDescription[] = "Portable Document Format"; | 53 const char kPDFPluginDescription[] = "Portable Document Format"; |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 | 524 |
| 525 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( | 525 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( |
| 526 content::PepperPluginInfo* plugin, | 526 content::PepperPluginInfo* plugin, |
| 527 bool* override_npapi_flash) { | 527 bool* override_npapi_flash) { |
| 528 if (!ConductingPepperFlashFieldTrial()) | 528 if (!ConductingPepperFlashFieldTrial()) |
| 529 return false; | 529 return false; |
| 530 return GetBundledPepperFlash(plugin, override_npapi_flash); | 530 return GetBundledPepperFlash(plugin, override_npapi_flash); |
| 531 } | 531 } |
| 532 | 532 |
| 533 } // namespace chrome | 533 } // namespace chrome |
| OLD | NEW |