diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
| commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
| tree | d12fb54a46443e18a9fa9a671392966ba6751202 /chrome/app | |
| parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
| download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 | |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/framework.order | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/app/framework.order b/chrome/app/framework.order index 71cb3d3..4ac4c01 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 -__ZN25CarbonPluginWindowTrackerC1Ev -__ZN25CarbonPluginWindowTrackerC2Ev -__ZN25CarbonPluginWindowTracker14SharedInstanceEv -__ZN25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv -__ZNK25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr -__ZNK25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv -__ZN25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr +__ZN6webkit5npapi25CarbonPluginWindowTrackerC1Ev +__ZN6webkit5npapi25CarbonPluginWindowTrackerC2Ev +__ZN6webkit5npapi25CarbonPluginWindowTracker14SharedInstanceEv +__ZN6webkit5npapi25CarbonPluginWindowTracker28CreateDummyWindowForDelegateEPv +__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDelegateForDummyWindowEP15OpaqueWindowPtr +__ZNK6webkit5npapi25CarbonPluginWindowTracker25GetDummyWindowForDelegateEPv +__ZN6webkit5npapi25CarbonPluginWindowTracker29DestroyDummyWindowForDelegateEPvP15OpaqueWindowPtr __ZN7WebCore22narrowPrecisionToFloatIdEEfT_ __ZN7WebCore24narrowPrecisionToCGFloatIdEEfT_ __ZnwmPv |