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

7 files changed, 21 insertions, 412 deletions

diff --git a/webkit/default_plugin/activex_installer.cc b/webkit/default_plugin/activex_installer.cc
deleted file mode 100644
index b7add77..0000000
--- a/webkit/default_plugin/activex_installer.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2006-2008 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/default_plugin/activex_installer.h"
-#include "base/string_util.h"
-
-ActiveXInstaller::ActiveXInstaller()
-    : wnd_(NULL),
-      notification_msg_(0) {
-}
-
-void ActiveXInstaller::Cleanup() {
-  if (bind_ctx_ != NULL) {
-    RevokeBindStatusCallback(bind_ctx_, this);
-    bind_ctx_.Release();
-  }
-}
-
-HRESULT ActiveXInstaller::StartDownload(const std::string& clsid,
-                                        const std::string& codebase,
-                                        HWND wnd,
-                                        UINT notification_msg) {
-  wnd_ = wnd;
-  notification_msg_ = notification_msg;
-
-  HRESULT hr = E_FAIL;
-  do {
-    CLSID id;
-    hr = CLSIDFromString(const_cast<LPOLESTR>(ASCIIToWide(clsid).c_str()), &id);
-    if (FAILED(hr))
-      break;
-
-    // Create the bind context, register it with myself (status callback).
-    hr = CreateBindCtx(0, bind_ctx_.Receive());
-    if (FAILED(hr))
-      break;
-    BIND_OPTS opts;
-    opts.cbStruct = sizeof(opts);
-    bind_ctx_->GetBindOptions(&opts);
-    opts.grfFlags |= BIND_MAYBOTHERUSER;
-    bind_ctx_->SetBindOptions(&opts);
-
-    hr = RegisterBindStatusCallback(bind_ctx_, this, 0, 0);
-    if (FAILED(hr))
-      break;
-    CComPtr<IClassFactory> class_factory;
-    hr = CoGetClassObjectFromURL(id, ASCIIToWide(codebase).c_str(), 0xffffffff,
-                                 0xffffffff, NULL, bind_ctx_,
-                                 CLSCTX_INPROC_HANDLER | CLSCTX_INPROC_SERVER,
-                                 0, IID_IClassFactory, (void**)&class_factory);
-  } while(false);
-
-  switch (hr) {
-    case S_OK:
-      PostMessage(wnd_, notification_msg_, hr, 0);
-      break;
-    case MK_S_ASYNCHRONOUS:
-      // Still need to wait until IBindStatusCallback is updated.
-      break;
-    default:
-      PostMessage(wnd_, notification_msg_, hr, 0);
-      break;
-  }
-  return hr;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnStartBinding(DWORD dw_reserved,
-                                                           IBinding* pib) {
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::GetPriority(LONG* pn_priority) {
-  return E_NOTIMPL;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnLowResource(DWORD reserved) {
-  return E_NOTIMPL;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnProgress(ULONG ul_progress,
-                                                       ULONG ul_progress_max,
-                                                       ULONG ul_status_code,
-                                                       LPCWSTR sz_status_text) {
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnStopBinding(HRESULT hresult,
-                                                          LPCWSTR sz_error) {
-  if (wnd_)
-    PostMessage(wnd_, notification_msg_, hresult, 0);
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::GetBindInfo(DWORD* grf_bindf,
-                                                        BINDINFO* pbindinfo) {
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnDataAvailable(
-    DWORD grf_bscf,
-    DWORD dw_size,
-    FORMATETC* pformatetc,
-    STGMEDIUM* pstgmed) {
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::OnObjectAvailable(REFIID riid,
-                                                              IUnknown* punk) {
-  return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE ActiveXInstaller::GetWindow(REFGUID rguid_reason,
-                                                      HWND* phwnd) {
-  *phwnd = wnd_;
-  return S_OK;
-}
diff --git a/webkit/default_plugin/activex_installer.h b/webkit/default_plugin/activex_installer.h
deleted file mode 100644
index 3b2ad6a..0000000
--- a/webkit/default_plugin/activex_installer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2006-2008 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_DEFAULT_PLUGIN_ACTIVEX_INSTALLER_H__
-#define WEBKIT_DEFAULT_PLUGIN_ACTIVEX_INSTALLER_H__
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <windows.h>
-#include <string>
-
-#include "base/scoped_comptr_win.h"
-
-// ActiveXInstaller is to help install an ActiveX control from a URL, usually
-// given by codebase.
-class ActiveXInstaller : public CComObjectRootEx<CComMultiThreadModel>,
-                         public IBindStatusCallback,
-                         public IWindowForBindingUI {
- public:
-  ActiveXInstaller();
-
-  // Start download and installation for an ActiveX control. After download
-  // installation, the installer will send notification_msg to wnd, where
-  // WPARAM of the message denotes the HRESULT.
-  HRESULT StartDownload(const std::string& clsid, const std::string& codebase,
-                        HWND wnd, UINT notification_msg);
-  // Revoke binding and release it if it's created.
-  void Cleanup();
-
-  // IBindStatusCallback
-  virtual HRESULT STDMETHODCALLTYPE OnStartBinding(DWORD dw_reserved,
-                                                   IBinding* pib);
-  virtual HRESULT STDMETHODCALLTYPE GetPriority(LONG* pn_priority);
-  virtual HRESULT STDMETHODCALLTYPE OnLowResource(DWORD reserved);
-  virtual HRESULT STDMETHODCALLTYPE OnProgress(ULONG ul_progress,
-                                               ULONG ul_progress_max,
-                                               ULONG ul_status_code,
-                                               LPCWSTR sz_status_text);
-  virtual HRESULT STDMETHODCALLTYPE OnStopBinding(HRESULT hresult,
-                                                  LPCWSTR sz_error);
-  virtual HRESULT STDMETHODCALLTYPE GetBindInfo(DWORD* grf_bindf,
-                                                BINDINFO* pbindinfo);
-  virtual HRESULT STDMETHODCALLTYPE OnDataAvailable(DWORD grf_bscf,
-                                                    DWORD dw_size,
-                                                    FORMATETC* pformatetc,
-                                                    STGMEDIUM* pstgmed);
-  virtual HRESULT STDMETHODCALLTYPE OnObjectAvailable(REFIID riid,
-                                                      IUnknown* punk);
-
-  // IWindowForBindingUI
-  virtual HRESULT STDMETHODCALLTYPE GetWindow(REFGUID rguid_reason,
-                                              HWND* phwnd);
-
-BEGIN_COM_MAP(ActiveXInstaller)
-  COM_INTERFACE_ENTRY(IBindStatusCallback)
-  COM_INTERFACE_ENTRY(IWindowForBindingUI)
-END_COM_MAP()
-
- private:
-  HWND wnd_;
-  UINT notification_msg_;
-  ScopedComPtr<IBindCtx> bind_ctx_;
-};
-
-#endif // #ifndef WEBKIT_DEFAULT_PLUGIN_ACTIVEX_INSTALLER_H__
diff --git a/webkit/default_plugin/default_plugin.gyp b/webkit/default_plugin/default_plugin.gyp
index 375431a..1b06416 100644
--- a/webkit/default_plugin/default_plugin.gyp
+++ b/webkit/default_plugin/default_plugin.gyp
@@ -20,7 +20,6 @@
             '../../third_party/icu38/icu38.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/npapi/npapi.gyp:npapi',
-            '../activex_shim/activex_shim.gyp:activex_shim',
             '../webkit.gyp:webkit_resources',
             '../webkit.gyp:webkit_strings',
           ],
@@ -32,8 +31,6 @@
           ],
           'msvs_guid': '5916D37D-8C97-424F-A904-74E52594C2D6',
           'sources': [
-            'activex_installer.cc',
-            'activex_installer.h',
             'default_plugin.cc',
             'default_plugin_resources.h',
             'default_plugin_shared.h',
diff --git a/webkit/default_plugin/default_plugin_shared.h b/webkit/default_plugin/default_plugin_shared.h
index 22c1926..d053688 100644
--- a/webkit/default_plugin/default_plugin_shared.h
+++ b/webkit/default_plugin/default_plugin_shared.h
@@ -21,6 +21,6 @@ enum MissingPluginStatus {
   MISSING_PLUGIN_USER_STARTED_DOWNLOAD
 };
 
-}  // namespace activex_shim
+}  // namespace default_plugin
 
 #endif // #ifndef WEBKIT_DEFAULT_PLUGIN_DEFAULT_PLUGIN_SHARED_H
diff --git a/webkit/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc
index 2f26107..2a62a1c 100644
--- a/webkit/default_plugin/plugin_impl_win.cc
+++ b/webkit/default_plugin/plugin_impl_win.cc
@@ -12,9 +12,6 @@
 #include "googleurl/src/gurl.h"
 #include "grit/webkit_strings.h"
 #include "unicode/locid.h"
-#include "webkit/default_plugin/activex_installer.h"
-#include "webkit/activex_shim/activex_shared.h"
-#include "webkit/activex_shim/npn_scripting.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/default_plugin/plugin_main.h"
 #include "webkit/glue/webkit_glue.h"
@@ -23,7 +20,6 @@ static const int TOOLTIP_MAX_WIDTH = 500;
 
 PluginInstallerImpl::PluginInstallerImpl(int16 mode)
     : instance_(NULL),
-      is_activex_(false),
       mode_(mode),
       plugin_install_stream_(NULL),
       plugin_installer_state_(PluginInstallerStateUndefined),
@@ -34,7 +30,6 @@ PluginInstallerImpl::PluginInstallerImpl(int16 mode)
       regular_font_(NULL),
       underline_font_(NULL),
       tooltip_(NULL),
-      activex_installer_(NULL),
       installation_job_monitor_thread_(
           new PluginInstallationJobMonitorThread()),
       plugin_database_handler_(*this),
@@ -50,11 +45,6 @@ PluginInstallerImpl::~PluginInstallerImpl() {
   if (underline_font_)
     DeleteObject(underline_font_);
 
-  if (activex_installer_) {
-    activex_installer_->Cleanup();
-    activex_installer_->Release();
-  }
-
   if (tooltip_)
     DestroyWindow(tooltip_);
 }
@@ -66,19 +56,18 @@ bool PluginInstallerImpl::Initialize(HINSTANCE module_handle, NPP instance,
   DCHECK(instance != NULL);
   DCHECK(module_handle != NULL);
 
+  if (mime_type == NULL || strlen(mime_type) == 0) {
+    DLOG(WARNING) << __FUNCTION__ << " Invalid parameters passed in";
+    NOTREACHED();
+    return false;
+  }
+
   instance_ = instance;
   mime_type_ = mime_type;
 
-  // The clsid without the {} parentheses.
-  std::string raw_activex_clsid;
-  if (!ParseInstantiationArguments(mime_type, instance, argc, argn, argv,
-                                   &raw_activex_clsid, &is_activex_,
-                                   &activex_clsid_,
-                                   &activex_codebase_,
-                                   &plugin_download_url_,
-                                   &plugin_finder_url_)) {
-    DLOG(ERROR) << "Incorrect arguments passed to plugin";
+  if (!webkit_glue::GetPluginFinderURL(&plugin_finder_url_)) {
     NOTREACHED();
+    DLOG(WARNING) << __FUNCTION__ << " Failed to get the plugin finder URL";
     return false;
   }
 
@@ -90,27 +79,8 @@ bool PluginInstallerImpl::Initialize(HINSTANCE module_handle, NPP instance,
 
   InitializeResources(module_handle);
 
-  if (is_activex_) {
-    // If the codebase is not from a whitelisted website, we do not allow
-    // download.
-    if (!activex_shim::IsCodebaseAllowed(raw_activex_clsid,
-                                         activex_codebase_)) {
-      activex_codebase_.clear();
-      plugin_download_url_.clear();
-    }
-
-    if (!plugin_download_url_.empty()) {
-      set_plugin_installer_state(PluginListDownloaded);
-      DisplayAvailablePluginStatus();
-      NotifyPluginStatus(default_plugin::MISSING_PLUGIN_AVAILABLE);
-    } else {
-      set_plugin_installer_state(PluginListDownloadFailed);
-      DisplayStatus(IDS_DEFAULT_PLUGIN_NO_PLUGIN_AVAILABLE_MSG);
-    }
-  } else {
-    DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_NO_PLUGIN_NAME);
-    plugin_database_handler_.DownloadPluginsFileIfNeeded(plugin_finder_url_);
-  }
+  DisplayStatus(IDS_DEFAULT_PLUGIN_GET_PLUGIN_MSG_NO_PLUGIN_NAME);
+  plugin_database_handler_.DownloadPluginsFileIfNeeded(plugin_finder_url_);
 
   return true;
 }
@@ -288,8 +258,6 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) {
 }
 
 int16 PluginInstallerImpl::NPP_HandleEvent(void* event) {
-  // This is a hack. The renderer will send a direct custom message to ask for
-  // installation.
   NPEvent* npp_event = static_cast<NPEvent*>(event);
   if (npp_event->event == kInstallMissingPluginMessage) {
     // We could get this message because InfoBar may not be in sync with our
@@ -362,25 +330,16 @@ void PluginInstallerImpl::DownloadPlugin() {
 
   DisplayStatus(IDS_DEFAULT_PLUGIN_DOWNLOADING_PLUGIN_MSG);
 
-  if (is_activex_) {
-    if (activex_installer_ == NULL) {
-      CComObject<ActiveXInstaller>::CreateInstance(&activex_installer_);
-      activex_installer_->AddRef();
-    }
-    activex_installer_->StartDownload(activex_clsid_, activex_codebase_,
-                                      hwnd(), kActivexInstallResult);
+  if (!plugin_download_url_for_display_) {
+    webkit_glue::DownloadUrl(plugin_download_url_, hwnd());
   } else {
-    if (!plugin_download_url_for_display_) {
-      webkit_glue::DownloadUrl(plugin_download_url_, hwnd());
-    } else {
-      default_plugin::g_browser->geturl(instance(),
-                                        plugin_download_url_.c_str(),
-                                        "_blank");
-      set_plugin_installer_state(PluginInstallerLaunchSuccess);
-      DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
-      enable_click_ = true;
-      RefreshDisplay();
-    }
+    default_plugin::g_browser->geturl(instance(),
+                                      plugin_download_url_.c_str(),
+                                      "_blank");
+    set_plugin_installer_state(PluginInstallerLaunchSuccess);
+    DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
+    enable_click_ = true;
+    RefreshDisplay();
   }
 }
 
@@ -653,43 +612,6 @@ LRESULT PluginInstallerImpl::OnCopyData(UINT message, WPARAM wparam,
   return 0;
 }
 
-LRESULT PluginInstallerImpl::OnActiveXInstallResult(UINT message,
-                                                    WPARAM wparam,
-                                                    LPARAM lparam,
-                                                    BOOL& handled) {
-  handled = TRUE;
-
-  if (SUCCEEDED(wparam)) {
-    set_plugin_installer_state(PluginInstallerLaunchSuccess);
-    DisplayStatus(IDS_DEFAULT_PLUGIN_REFRESH_PLUGIN_MSG);
-    PostMessage(hwnd(), kRefreshPluginsMessage, 0, 0);
-  } else if ((wparam == INET_E_UNKNOWN_PROTOCOL) ||
-             (wparam == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND))) {
-    set_plugin_installer_state(PluginDownloadFailed);
-    DisplayPluginDownloadFailedStatus();
-  } else {
-    set_plugin_installer_state(PluginInstallerLaunchFailure);
-    DisplayStatus(IDS_DEFAULT_PLUGIN_INSTALLATION_FAILED_MSG);
-  }
-  return 0;
-}
-
-std::string PluginInstallerImpl::ResolveURL(NPP instance,
-                                            const std::string& relative_url) {
-  // The NPAPI functions may not be available if this function is called
-  // as a result of a unit test.
-  if (default_plugin::g_browser) {
-    NPObject* object = NULL;
-    default_plugin::g_browser->getvalue(instance, NPNVWindowNPObject, &object);
-    activex_shim::NPNScriptableObject window(instance, object);
-    std::wstring url =
-        window.GetObjectProperty("document").GetStringProperty("URL");
-    GURL base(url);
-    return base.Resolve(relative_url).spec();
-  }
-  return relative_url;
-}
-
 bool PluginInstallerImpl::InitializeResources(HINSTANCE module_handle) {
   DCHECK(icon_ == NULL);
   DCHECK(regular_font_ == NULL);
@@ -715,68 +637,6 @@ bool PluginInstallerImpl::InitializeResources(HINSTANCE module_handle) {
   return true;
 }
 
-bool PluginInstallerImpl::ParseInstantiationArguments(
-    NPMIMEType mime_type,
-    NPP instance,
-    int16 argc,
-    char* argn[],
-    char* argv[],
-    std::string* raw_activex_clsid,
-    bool* is_activex,
-    std::string* activex_clsid,
-    std::string* activex_codebase,
-    std::string* plugin_download_url,
-    std::string* plugin_finder_url) {
-
-  if (!raw_activex_clsid || !is_activex || !activex_clsid ||
-      !plugin_download_url || !plugin_finder_url || !activex_codebase) {
-    NOTREACHED();
-    return false;
-  }
-
-  *is_activex = false;
-
-  bool valid_mime_type = (mime_type != NULL ? strlen(mime_type) > 0 : false);
-
-  for (int i = 0; i < argc; ++i) {
-    // We should only look for activex installation if the mime type passed in
-    // is not valid. In any case this code will be taken out when we remove
-    // the activex shim.
-    if (!valid_mime_type && LowerCaseEqualsASCII(argn[i], "classid") &&
-        activex_shim::GetClsidFromClassidAttribute(argv[i],
-                                                   raw_activex_clsid)) {
-      *is_activex = true;
-      *activex_clsid = std::string("{") + *raw_activex_clsid + "}";
-    }
-    if (LowerCaseEqualsASCII(argn[i], "codebase")) {
-      *activex_codebase = ResolveURL(instance, argv[i]);
-      size_t pos = activex_codebase->find('#');
-      if (pos != std::string::npos)
-        *plugin_download_url = activex_codebase->substr(0, pos);
-      else
-        *plugin_download_url = *activex_codebase;
-    }
-  }
-
-  if (!*is_activex) {
-    if (!valid_mime_type || !instance) {
-      DLOG(WARNING) << __FUNCTION__ << " Invalid parameters passed in";
-      NOTREACHED();
-      return false;
-    }
-
-    if (!webkit_glue::GetPluginFinderURL(plugin_finder_url)) {
-      NOTREACHED();
-      DLOG(WARNING) << __FUNCTION__ << " Failed to get the plugin finder URL";
-      return false;
-    }
-
-    DLOG(INFO) << "Plugin finder URL is " << plugin_finder_url->c_str();
-  }
-
-  return true;
-}
-
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
     instance_,
diff --git a/webkit/default_plugin/plugin_impl_win.h b/webkit/default_plugin/plugin_impl_win.h
index 1a1e123..3f2191c 100644
--- a/webkit/default_plugin/plugin_impl_win.h
+++ b/webkit/default_plugin/plugin_impl_win.h
@@ -28,7 +28,6 @@ enum PluginInstallerState {
   PluginInstallerLaunchFailure
 };
 
-class ActiveXInstaller;
 class PluginInstallDialog;
 class PluginDatabaseHandler;
 
@@ -39,7 +38,6 @@ class PluginInstallerImpl : public base::WindowImpl {
  public:
   static const int kRefreshPluginsMessage  = WM_APP + 1;
   static const int kInstallMissingPluginMessage = WM_APP + 2;
-  static const int kActivexInstallResult = WM_USER + 74;
 
   // mode is the plugin instantiation mode, i.e. whether it is a full
   // page plugin (NP_FULL) or an embedded plugin (NP_EMBED)
@@ -53,7 +51,6 @@ class PluginInstallerImpl : public base::WindowImpl {
     MESSAGE_HANDLER(kRefreshPluginsMessage, OnRefreshPlugins)
     MESSAGE_HANDLER(WM_COPYDATA, OnCopyData)
     MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor)
-    MESSAGE_HANDLER(kActivexInstallResult, OnActiveXInstallResult)
   END_MSG_MAP()
 
   // Initializes the plugin with the instance information, mime type
@@ -143,11 +140,7 @@ class PluginInstallerImpl : public base::WindowImpl {
   //   Describes why the notification was sent.
   void URLNotify(const char* url, NPReason reason);
 
-  // Initiates activex installs if applicable.
-  // Note: The null plugin being a windowed plugin does not have to implement
-  // NPP_HandleEvent. However to handle activex installations, we have this
-  // hack to allow the renderer to send out a request for installing the
-  // activex.
+  // Used by the renderer to indicate plugin install through the infobar.
   int16 NPP_HandleEvent(void* event);
 
   const std::string& mime_type() const { return mime_type_; }
@@ -189,41 +182,6 @@ class PluginInstallerImpl : public base::WindowImpl {
   // Arabic).
   static bool IsRTLLayout();
 
-  // Parses the plugin instantiation arguments. This includes checking for
-  // whether this is an activex install and reading the appropriate
-  // arguments like codebase, etc. For plugin installs we download the
-  // plugin finder URL and initalize the mime type and the plugin instance
-  // info.
-  //
-  // Parameters:
-  // module_handle: The handle to the dll in which this object is instantiated.
-  // instance: The plugins opaque instance handle.
-  // mime_type: Identifies the third party plugin
-  // argc: Indicates the count of arguments passed in from the webpage.
-  // argv: Pointer to the arguments.
-  // raw_activex_clsid: Output parameter which contains the CLSID of the
-  //                    Activex plugin needed for an Activex install
-  // is_activex: Output parameter indicating if this is an activex install
-  // activex_clsid: Output parameter containing the classid of the activex
-  //                for an activex install
-  // activex_codebase: Output parameter containing the activex codebase if
-  //                   this is an activex install
-  // plugin_download_url: Output parameter containing the plugin download url
-  //                      on success.
-  // plugin_finder_url: Output parameter containing the plugin finder url on
-  //                    success.
-  // Returns true on success.
-  static bool ParseInstantiationArguments(NPMIMEType mime_type,
-                                          NPP instance,
-                                          int16 argc,
-                                          char* argn[],
-                                          char* argv[],
-                                          std::string* raw_activex_clsid,
-                                          bool* is_activex,
-                                          std::string* activex_clsid,
-                                          std::string* activex_codebase,
-                                          std::string* plugin_download_url,
-                                          std::string* plugin_finder_url);
  protected:
   // Window message handlers.
   LRESULT OnPaint(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
@@ -243,10 +201,6 @@ class PluginInstallerImpl : public base::WindowImpl {
   // plugin completes.
   LRESULT OnCopyData(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
 
-  // Displays status information for ActiveX installs
-  LRESULT OnActiveXInstallResult(UINT message, WPARAM wparam, LPARAM lparam,
-                                 BOOL& handled);
-
   // Displays the plugin install confirmation dialog.
   void ShowInstallDialog();
 
@@ -278,17 +232,6 @@ class PluginInstallerImpl : public base::WindowImpl {
   // Update ToolTip text with the message shown inside the default plugin.
   void UpdateToolTip();
 
-  // Resolves the relative URL (could be already an absolute URL too) to return
-  // full URL based on current document's URL and base.
-  //
-  // Parameters:
-  // instance
-  //   The plugins opaque instance handle.
-  // relative_url
-  //   The URL to be resolved.
-  // Returns the resolved URL.
-  static std::string ResolveURL(NPP instance, const std::string& relative_url);
-
   // Initializes resources like the icon, fonts, etc needed by the plugin
   // installer
   //
@@ -318,8 +261,6 @@ class PluginInstallerImpl : public base::WindowImpl {
 
   // The plugins opaque instance handle
   NPP instance_;
-  // If this is to install activex
-  bool is_activex_;
   // The plugin instantiation mode (NP_FULL or NP_EMBED)
   int16 mode_;
   // The handle to the icon displayed in the plugin installation window.
@@ -368,10 +309,6 @@ class PluginInstallerImpl : public base::WindowImpl {
   HFONT underline_font_;
   // Tooltip Window.
   HWND tooltip_;
-  // ActiveX related.
-  std::string activex_codebase_;
-  std::string activex_clsid_;
-  CComObject<ActiveXInstaller>* activex_installer_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
 };
diff --git a/webkit/default_plugin/plugin_main.cc b/webkit/default_plugin/plugin_main.cc
index b0a24f8..95dda07 100644
--- a/webkit/default_plugin/plugin_main.cc
+++ b/webkit/default_plugin/plugin_main.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "webkit/activex_shim/npp_impl.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -46,7 +45,6 @@ NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) {
 
 NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs) {
   g_browser = funcs;
-  activex_shim::g_browser = funcs;
   return 0;
 }