Clean up flash plugin constants, put them in a single place.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7790013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98902 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/component_updater/pepper_flash_component_installer.cc

@@ -18,6 +18,7 @@
 #include "content/browser/browser_thread.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/plugin_constants.h"
 
 namespace {
 
@@ -47,12 +48,6 @@ const char kPepperFlashManifestName[] =
     "NixFlapper";
 #endif
 
-const char* kFlashPluginName = "Shockwave Flash";
-const char* kFlashPluginSwfMimeType = "application/x-shockwave-flash";
-const char* kFlashPluginSwfExtension = "swf";
-const char* kFlashPluginSplMimeType = "application/futuresplash";
-const char* kFlashPluginSplExtension = "spl";
-
 // The pepper flash plugins are in a directory with this name.
 const FilePath::CharType kPepperFlashBaseDirectory[] =
     FILE_PATH_LITERAL("PepperFlash");

chrome/common/chrome_content_client.cc

@@ -22,6 +22,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
+#include "webkit/plugins/plugin_constants.h"
 
 #if defined(OS_WIN)
 #include "content/common/sandbox_policy.h"
@@ -60,16 +61,7 @@ const char* kRemotingViewerPluginOldMimeType =
     "pepper-application/x-chromoting";
 #endif
 
-const char* kFlashPluginName = "Shockwave Flash";
-const char* kFlashPluginSwfMimeType = "application/x-shockwave-flash";
-const char* kFlashPluginSwfExtension = "swf";
-const char* kFlashPluginSwfDescription = "Shockwave Flash";
-const char* kFlashPluginSplMimeType = "application/futuresplash";
-const char* kFlashPluginSplExtension = "spl";
-const char* kFlashPluginSplDescription = "FutureSplash Player";
-
 #if !defined(NACL_WIN64)  // The code this needs isn't linked on Win64 builds.
-
 // Appends the known built-in plugins to the given vector. Some built-in
 // plugins are "internal" which means they are compiled into the Chrome binary,
 // and some are extra shared libraries distributed with the browser (these are

webkit/glue/webkit_glue.gypi

@@ -182,6 +182,8 @@
         '../plugins/npapi/webplugin_impl.h',
         '../plugins/npapi/webview_plugin.cc',
         '../plugins/npapi/webview_plugin.h',
+        '../plugins/plugin_constants.cc',
+        '../plugins/plugin_constants.h',
         '../plugins/plugin_switches.cc',
         '../plugins/plugin_switches.h',
         '../plugins/ppapi/callbacks.cc',

webkit/plugins/plugin_constants.cc

+// Copyright (c) 2011 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 "webkit/plugins/plugin_constants.h"
+
+const char kFlashPluginName[] = "Shockwave Flash";
+const char kFlashPluginSwfMimeType[] = "application/x-shockwave-flash";
+const char kFlashPluginSwfExtension[] = "swf";
+const char kFlashPluginSwfDescription[] = "Shockwave Flash";
+const char kFlashPluginSplMimeType[] = "application/futuresplash";
+const char kFlashPluginSplExtension[] = "spl";
+const char kFlashPluginSplDescription[] = "FutureSplash Player";

webkit/plugins/plugin_constants.h

+// Copyright (c) 2011 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.
+
+#ifndef WEBKIT_PLUGINS_PLUGIN_CONSTANTS_H_
+#define WEBKIT_PLUGINS_PLUGIN_CONSTANTS_H_
+
+extern const char kFlashPluginName[];
+extern const char kFlashPluginSwfMimeType[];
+extern const char kFlashPluginSwfExtension[];
+extern const char kFlashPluginSwfDescription[];
+extern const char kFlashPluginSplMimeType[];
+extern const char kFlashPluginSplExtension[];
+extern const char kFlashPluginSplDescription[];
+
+#endif  // WEBKIT_PLUGINS_PLUGIN_CONSTANTS_H_