diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:54:25 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-28 02:54:25 +0000 |
| commit | 6ee30c0e5e22341cb73c9390aab3e580bcad6a91 (patch) | |
| tree | 481e4ae6121f64cd1e31f706510f2ce7d066c5c4 | |
| parent | 22362c7358df89e2c0c94c4dd43ecfe90ac3da27 (diff) | |
| download | chromium_src-6ee30c0e5e22341cb73c9390aab3e580bcad6a91.zip chromium_src-6ee30c0e5e22341cb73c9390aab3e580bcad6a91.tar.gz chromium_src-6ee30c0e5e22341cb73c9390aab3e580bcad6a91.tar.bz2 | |
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
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 6 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 7 |
2 files changed, 3 insertions, 10 deletions
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"; diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 78b967d..c0d8a57 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -7,6 +7,8 @@ # TODO(dmaclach): can we pick this up some other way? Right now it's # duplicated from chrome.gyp 'chromium_code': 1, + # Use a consistent MIME-type independent of branding. + 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', 'conditions': [ ['OS=="mac"', { 'conditions': [ @@ -29,11 +31,6 @@ 'plugin_extension': 'dll', 'plugin_prefix': '', }], - ['branding=="Chrome"', { - 'host_plugin_mime_type': 'application/vnd.google-chrome.remoting-host', - }, { # else: branding!="Chrome" - 'host_plugin_mime_type': 'application/vnd.chromium.remoting-host', - }], # branding ], }, |