From 6ee30c0e5e22341cb73c9390aab3e580bcad6a91 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Sat, 28 May 2011 02:54:25 +0000 Subject: Use the same MIME types regardless of branding, for compatibility. BUG= TEST=Remoting web app works in suitably configured Google Chrome and Chromium browsers. Review URL: http://codereview.chromium.org/7088003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87149 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/chrome_content_client.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'chrome/common') diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 680a661..d77138b 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -32,13 +32,9 @@ const char* kNaClPluginDescription = "Native Client Executable"; const char* kRemotingViewerPluginName = "Remoting Viewer"; const FilePath::CharType kRemotingViewerPluginPath[] = FILE_PATH_LITERAL("internal-remoting-viewer"); -#if defined(GOOGLE_CHROME_BUILD) -const char* kRemotingViewerPluginMimeType = - "application/vnd.google-chrome.remoting-viewer"; -#else // CHROMIUM_BUILD +// Use a consistent MIME-type regardless of branding. const char* kRemotingViewerPluginMimeType = "application/vnd.chromium.remoting-viewer"; -#endif // TODO(wez): Remove the old MIME-type once client code no longer needs it. const char* kRemotingViewerPluginOldMimeType = "pepper-application/x-chromoting"; -- cgit v1.1