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

5 files changed, 0 insertions, 203 deletions

diff --git a/webkit/activex_shim_dll/activex_shim_dll.cc b/webkit/activex_shim_dll/activex_shim_dll.cc
deleted file mode 100644
index 558388f..0000000
--- a/webkit/activex_shim_dll/activex_shim_dll.cc
+++ /dev/null
@@ -1,46 +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 <windows.h>
-
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "webkit/activex_shim/npp_impl.h"
-
-base::AtExitManager* g_exit_manager = NULL;
-// DLL Entry Point
-extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason,
-                               LPVOID reserved) {
-  if (reason == DLL_PROCESS_ATTACH) {
-    g_exit_manager = new base::AtExitManager();
-#ifdef TRACK_INTERFACE
-    CommandLine::Init(0, NULL);
-
-    // TODO(ruijiang): Ugly hard-coded path is not good. But we only do it
-    // for debug build now to trace interface use. Try to find a better place
-    // later.
-    logging::InitLogging(L"c:\\activex_shim.log",
-                         logging::LOG_ONLY_TO_FILE,
-                         logging::DONT_LOCK_LOG_FILE,
-                         logging::DELETE_OLD_LOG_FILE);
-#endif
-  } else if (reason == DLL_PROCESS_DETACH) {
-    delete g_exit_manager;
-    g_exit_manager = NULL;
-  }
-  return TRUE;
-}
-
-NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs) {
-  return activex_shim::ActiveX_Shim_NP_GetEntryPoints(funcs);
-}
-
-NPError WINAPI NP_Initialize(NPNetscapeFuncs* funcs) {
-  return activex_shim::ActiveX_Shim_NP_Initialize(funcs);
-}
-
-NPError WINAPI NP_Shutdown(void) {
-  return activex_shim::ActiveX_Shim_NP_Shutdown();
-}
diff --git a/webkit/activex_shim_dll/activex_shim_dll.def b/webkit/activex_shim_dll/activex_shim_dll.def
deleted file mode 100644
index bd7ff40..0000000
--- a/webkit/activex_shim_dll/activex_shim_dll.def
+++ /dev/null
@@ -1,6 +0,0 @@
-; activex_shim.def : Declares the module parameters.
-
-EXPORTS
-  NP_GetEntryPoints   @1
-  NP_Initialize       @2
-  NP_Shutdown         @3
diff --git a/webkit/activex_shim_dll/activex_shim_dll.gyp b/webkit/activex_shim_dll/activex_shim_dll.gyp
deleted file mode 100644
index c8e6948..0000000
--- a/webkit/activex_shim_dll/activex_shim_dll.gyp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    '../../build/common.gypi',
-  ],
-  'conditions': [
-    [ 'OS=="win"', {
-      'targets': [
-        {
-          'target_name': 'activex_shim_dll',
-          'type': 'loadable_module',
-          'dependencies': [
-            '../../base/base.gyp:base',
-            '../../third_party/npapi/npapi.gyp:npapi',
-            '../activex_shim/activex_shim.gyp:activex_shim',
-          ],
-          'product_name': 'npaxshim',
-          'msvs_guid': '494E414B-1655-48CE-996D-6413ECFB7829',
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'RegisterOutput': 'false',
-            },
-          },
-          'sources': [
-            'activex_shim_dll.cc',
-            'activex_shim_dll.def',
-            'activex_shim_dll.rc',
-            'resource.h',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lurlmon.lib',
-            ],
-          },
-        },
-      ],
-    }],
-  ],
-}
diff --git a/webkit/activex_shim_dll/activex_shim_dll.rc b/webkit/activex_shim_dll/activex_shim_dll.rc
deleted file mode 100644
index 570db49..0000000
--- a/webkit/activex_shim_dll/activex_shim_dll.rc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Company", "Google Inc."
-            VALUE "ProductName", "ActiveX Plug-in"
-            VALUE "ProductVersion", "1, 0, 0, 1"
-            VALUE "FileDescription", "ActiveX Plug-in provides a shim to support ActiveX controls"
-            VALUE "FileVersion", "1, 0, 0, 1"
-            VALUE "InternalName", "ActiveX Plug-in"
-            VALUE "OriginalFilename", "npaxshim.dll"
-            VALUE "Language", "English (United States)"
-            VALUE "FileExtents", ""
-            VALUE "MIMEType", "application/x-oleobject|application/oleobject|application/x-activex-handler"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (U.S.) resources
-
-/////////////////////////////////////////////////////////////////////////////
-#ifndef APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/webkit/activex_shim_dll/resource.h b/webkit/activex_shim_dll/resource.h
deleted file mode 100644
index 81ef3b3..0000000
--- a/webkit/activex_shim_dll/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by activex_shim.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        201
-#define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           100
-#endif
-#endif