diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-02 16:50:58 +0000 |
commit | 2290cb86f535d7babd4d84a2a08831404885e78c (patch) | |
tree | 09bca698a3e1a66c14ff50771dee24cd5751c918 /webkit/support | |
parent | e9b3528e6a8d79f465fcdd2e44477f1eb9275539 (diff) | |
download | chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.zip chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.gz chromium_src-2290cb86f535d7babd4d84a2a08831404885e78c.tar.bz2 |
Make webkit_glue not depend on default_plugin.
This removes a dependency cycle and should also make life easier for DRT.
Revert http://codereview.chromium.org/1658012
Review URL: http://codereview.chromium.org/2358001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r-- | webkit/support/default_plugin_stubs_win.cc | 29 | ||||
-rw-r--r-- | webkit/support/webkit_support.gypi | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/webkit/support/default_plugin_stubs_win.cc b/webkit/support/default_plugin_stubs_win.cc deleted file mode 100644 index f728d1e..0000000 --- a/webkit/support/default_plugin_stubs_win.cc +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2010 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. - -// These are stubs for default_plugin which isn't currently built in -// a webkit only checkout. - -#include "base/logging.h" -#include "third_party/npapi/bindings/npapi.h" -#include "third_party/npapi/bindings/nphostapi.h" - -namespace default_plugin { - -NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) { - NOTIMPLEMENTED(); - return NPERR_GENERIC_ERROR; -} - -NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs) { - NOTIMPLEMENTED(); - return NPERR_GENERIC_ERROR; -} - -NPError API_CALL NP_Shutdown(void) { - NOTIMPLEMENTED(); - return NPERR_GENERIC_ERROR; -} - -} // default_plugin diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index 9e5a358..50f79bf 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -21,7 +21,6 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit ], 'sources': [ - 'default_plugin_stubs_win.cc', 'platform_support.h', 'platform_support_gtk.cc', 'platform_support_mac.mm', |