summaryrefslogtreecommitdiffstats
path: root/chrome/app/framework.order
diff options
context:
space:
mode:
authorchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 00:23:26 +0000
committerchase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 00:23:26 +0000
commitc85b0ba71b5a55647b01de9d345e46896979033d (patch)
treeae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/app/framework.order
parent887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff)
downloadchromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip
chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz
chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree. BUG=none TEST=none TBR=dmaclach@chromium.org Review URL: http://codereview.chromium.org/5998002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/framework.order')
-rw-r--r--chrome/app/framework.order14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/app/framework.order b/chrome/app/framework.order
index 4ac4c01..71cb3d3 100644
--- a/chrome/app/framework.order
+++ b/chrome/app/framework.order
@@ -30,13 +30,13 @@ __ZN22mac_plugin_interposing31NotifyBrowserOfPluginHideWindowEj6CGRect
__ZN22mac_plugin_interposing28NotifyPluginOfSetThemeCursorEPvm
__ZN22mac_plugin_interposing23NotifyPluginOfSetCursorEPvPK6Cursor
__ZN22mac_plugin_interposing23GetPluginWindowHasFocusEPv
-__ZN6webkit5npapi25CarbonPluginWindowTrackerC1Ev
-__ZN6webkit5npapi25CarbonPluginWindowTrackerC2Ev
-__ZN6webkit5npapi25CarbonPluginWindowTracker14SharedInstanceEv
-__ZN6webkit5npapi25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv
-__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr
-__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv
-__ZN6webkit5npapi25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr
+__ZN25CarbonPluginWindowTrackerC1Ev
+__ZN25CarbonPluginWindowTrackerC2Ev
+__ZN25CarbonPluginWindowTracker14SharedInstanceEv
+__ZN25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv
+__ZNK25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr
+__ZNK25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv
+__ZN25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr
__ZN7WebCore22narrowPrecisionToFloatIdEEfT_
__ZN7WebCore24narrowPrecisionToCGFloatIdEEfT_
__ZnwmPv