diff options
| -rw-r--r-- | chrome/chrome_common.gypi | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 13 | ||||
| -rw-r--r-- | chrome/common/chrome_content_client_constants.cc | 13 |
3 files changed, 16 insertions, 11 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 47b66b3..ab53e50 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -121,6 +121,7 @@ 'common/child_process_logging_win.cc', 'common/chrome_content_client.cc', 'common/chrome_content_client.h', + 'common/chrome_content_client_constants.cc', 'common/chrome_content_client_ios.mm', 'common/chrome_notification_types.h', 'common/chrome_result_codes.h', diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 3a9a030..e330037 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -55,7 +55,6 @@ namespace { -const char kPDFPluginName[] = "Chrome PDF Viewer"; const char kPDFPluginMimeType[] = "application/pdf"; const char kPDFPluginExtension[] = "pdf"; const char kPDFPluginDescription[] = "Portable Document Format"; @@ -64,15 +63,12 @@ const char kPDFPluginPrintPreviewMimeType const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; -const char kNaClPluginName[] = "Native Client"; const char kNaClPluginMimeType[] = "application/x-nacl"; const char kNaClPluginExtension[] = "nexe"; const char kNaClPluginDescription[] = "Native Client Executable"; const uint32 kNaClPluginPermissions = ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV; -const char kNaClOldPluginName[] = "Chrome NaCl"; - const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator"; const char kO3DPluginMimeType[] ="application/vnd.o3d.auto"; const char kO3DPluginExtension[] = ""; @@ -137,7 +133,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) { if (skip_pdf_file_check || file_util::PathExists(path)) { content::PepperPluginInfo pdf; pdf.path = path; - pdf.name = kPDFPluginName; + pdf.name = chrome::ChromeContentClient::kPDFPluginName; webkit::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType, kPDFPluginExtension, kPDFPluginDescription); @@ -163,7 +159,7 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) { if (skip_nacl_file_check || file_util::PathExists(path)) { content::PepperPluginInfo nacl; nacl.path = path; - nacl.name = kNaClPluginName; + nacl.name = chrome::ChromeContentClient::kNaClPluginName; webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType, kNaClPluginExtension, kNaClPluginDescription); @@ -375,11 +371,6 @@ bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) { namespace chrome { -const char* const ChromeContentClient::kPDFPluginName = ::kPDFPluginName; -const char* const ChromeContentClient::kNaClPluginName = ::kNaClPluginName; -const char* const ChromeContentClient::kNaClOldPluginName = - ::kNaClOldPluginName; - std::string ChromeContentClient::GetProductImpl() { chrome::VersionInfo version_info; std::string product("Chrome/"); diff --git a/chrome/common/chrome_content_client_constants.cc b/chrome/common/chrome_content_client_constants.cc new file mode 100644 index 0000000..aeea06f --- /dev/null +++ b/chrome/common/chrome_content_client_constants.cc @@ -0,0 +1,13 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/common/chrome_content_client.h" + +namespace chrome { + +const char* const ChromeContentClient::kPDFPluginName = "Chrome PDF Viewer"; +const char* const ChromeContentClient::kNaClPluginName = "Native Client"; +const char* const ChromeContentClient::kNaClOldPluginName = "Chrome NaCl"; + +} // namespace chrome |