Take out the activex control.BUG=20259

Review URL: http://codereview.chromium.org/200031

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

4 files changed, 4 insertions, 11 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 0e2a5ae..cd422f2 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -2112,7 +2112,6 @@ void RenderView::didExecuteCommand(const WebString& command_name) {
 webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
     const GURL& url,
     const std::string& mime_type,
-    const std::string& clsid,
     std::string* actual_mime_type) {
   if (!PluginChannelHost::IsListening())
     return NULL;
@@ -2123,9 +2122,8 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
     policy_url = main_frame->url();
 
   FilePath path;
-  render_thread_->Send(
-      new ViewHostMsg_GetPluginPath(url, policy_url, mime_type, clsid, &path,
-                                    actual_mime_type));
+  render_thread_->Send(new ViewHostMsg_GetPluginPath(
+      url, policy_url, mime_type, &path, actual_mime_type));
   if (path.value().empty())
     return NULL;
 
@@ -2145,7 +2143,7 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
 #endif
   }
 
-  return new WebPluginDelegateProxy(*mime_type_to_use, clsid, AsWeakPtr());
+  return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr());
 }
 
 void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index b9fbee2..34d48a9 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -363,7 +363,6 @@ class RenderView : public RenderWidget,
   virtual webkit_glue::WebPluginDelegate* CreatePluginDelegate(
       const GURL& url,
       const std::string& mime_type,
-      const std::string& clsid,
       std::string* actual_mime_type);
   virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle);
   virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 3740eb1..2c728d7 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -160,14 +160,12 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
 
 WebPluginDelegateProxy::WebPluginDelegateProxy(
     const std::string& mime_type,
-    const std::string& clsid,
     const base::WeakPtr<RenderView>& render_view)
     : render_view_(render_view),
       plugin_(NULL),
       windowless_(false),
       window_(NULL),
       mime_type_(mime_type),
-      clsid_(clsid),
       npobject_(NULL),
       window_script_object_(NULL),
       sad_plugin_(NULL),
@@ -225,7 +223,7 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url,
   IPC::ChannelHandle channel_handle;
   WebPluginInfo info;
   if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
-          url, mime_type_, clsid_, webkit_glue::GetWebKitLocale(),
+          url, mime_type_, webkit_glue::GetWebKitLocale(),
           &channel_handle, &info))) {
     return false;
   }
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index a9cfab8..043bdb8 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -43,7 +43,6 @@ class WebPluginDelegateProxy :
     public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
   WebPluginDelegateProxy(const std::string& mime_type,
-                         const std::string& clsid,
                          const base::WeakPtr<RenderView>& render_view);
 
   // Called to drop our pointer to the window script object.
@@ -166,7 +165,6 @@ class WebPluginDelegateProxy :
   gfx::PluginWindowHandle window_;
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
-  std::string clsid_;
   int instance_id_;
   WebPluginInfo info_;