diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 02:57:40 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-02 02:57:40 +0000 |
| commit | c301041a8518ab25d7bb4753d74f4e62857b4876 (patch) | |
| tree | dd413bb0cc96064a9068181dbad8213ab33aaf5e | |
| parent | 1e2a358b96688c5a3e983992b7178ebc0caf9aaf (diff) | |
| download | chromium_src-c301041a8518ab25d7bb4753d74f4e62857b4876.zip chromium_src-c301041a8518ab25d7bb4753d74f4e62857b4876.tar.gz chromium_src-c301041a8518ab25d7bb4753d74f4e62857b4876.tar.bz2 | |
Remove old MIME type for client plugin, and cleanup unused include.
BUG=86353,112532
Review URL: https://chromiumcodereview.appspot.com/10478002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140168 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/chrome_content_client.cc | 9 | ||||
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 7ef863d..9533418b 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -74,10 +74,6 @@ const FilePath::CharType kRemotingViewerPluginPath[] = // Use a consistent MIME-type regardless of branding. const char kRemotingViewerPluginMimeType[] = "application/vnd.chromium.remoting-viewer"; -// TODO(garykac): Remove the old MIME-type once client code no longer needs it. -// Tracked in crbug.com/112532. -const char kRemotingViewerPluginOldMimeType[] = - "pepper-application/x-chromoting"; #endif // Appends the known built-in plugins to the given vector. Some built-in @@ -181,11 +177,6 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) { std::string(), std::string()); info.mime_types.push_back(remoting_mime_type); - webkit::WebPluginMimeType old_remoting_mime_type( - kRemotingViewerPluginOldMimeType, - std::string(), - std::string()); - info.mime_types.push_back(old_remoting_mime_type); info.internal_entry_points.get_interface = remoting::PPP_GetInterface; info.internal_entry_points.initialize_module = remoting::PPP_InitializeModule; diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index ddc6b97..d6c8b5c 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -24,8 +24,6 @@ #include "ppapi/cpp/completion_callback.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/rect.h" -// TODO(wez): Remove this when crbug.com/86353 is complete. -#include "ppapi/cpp/private/var_private.h" #include "remoting/base/constants.h" #include "remoting/base/util.h" #include "remoting/client/client_config.h" |