diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-01 02:08:38 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-01 02:08:38 +0000 |
| commit | c96c3c973c12f552ed6abd565fd326c32c227a5f (patch) | |
| tree | a99d3b057ba4d96f4eb077d3a277fbc9582300e5 | |
| parent | a6c132a541d1ff36e0a42d7ac32776f9208f1ffc (diff) | |
| download | chromium_src-c96c3c973c12f552ed6abd565fd326c32c227a5f.zip chromium_src-c96c3c973c12f552ed6abd565fd326c32c227a5f.tar.gz chromium_src-c96c3c973c12f552ed6abd565fd326c32c227a5f.tar.bz2 | |
Fix types that reached into WebCore and busted deps roll.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/1727021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46175 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/np_browser_functions.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/np_browser_functions.h | 4 | ||||
| -rw-r--r-- | chrome_frame/np_proxy_service.h | 2 | ||||
| -rw-r--r-- | chrome_frame/npapi_url_request.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome_frame/np_browser_functions.cc b/chrome_frame/np_browser_functions.cc index 523acdf..801d60a 100644 --- a/chrome_frame/np_browser_functions.cc +++ b/chrome_frame/np_browser_functions.cc @@ -64,9 +64,9 @@ NPN_PopPopupsEnabledStateProcPtr g_poppopupsenabledstate = NULL; NPN_EnumerateProcPtr g_enumerate = NULL; NPN_PluginThreadAsyncCallProcPtr g_pluginthreadasynccall = NULL; NPN_ConstructProcPtr g_construct = NULL; -NPN_GetValueForURLProcPtr g_getvalueforurl = NULL; -NPN_SetValueForURLProcPtr g_setvalueforurl = NULL; -NPN_GetAuthenticationInfoProcPtr g_getauthenticationinfo = NULL; +NPN_GetValueForURLPtr g_getvalueforurl = NULL; +NPN_SetValueForURLPtr g_setvalueforurl = NULL; +NPN_GetAuthenticationInfoPtr g_getauthenticationinfo = NULL; // Must be called prior to calling any of the browser functions below. void InitializeBrowserFunctions(NPNetscapeFuncs* functions) { diff --git a/chrome_frame/np_browser_functions.h b/chrome_frame/np_browser_functions.h index 5c1003c..1a85cee 100644 --- a/chrome_frame/np_browser_functions.h +++ b/chrome_frame/np_browser_functions.h @@ -6,8 +6,8 @@ #define CHROME_FRAME_NP_BROWSER_FUNCTIONS_H_ #include "base/logging.h" -#include "third_party/WebKit/WebCore/bridge/npapi.h" -#include "third_party/WebKit/WebCore/plugins/npfunctions.h" +#include "third_party/npapi/bindings/npapi.h" +#include "third_party/npapi/bindings/nphostapi.h" namespace npapi { diff --git a/chrome_frame/np_proxy_service.h b/chrome_frame/np_proxy_service.h index e41bda1..0788b92 100644 --- a/chrome_frame/np_proxy_service.h +++ b/chrome_frame/np_proxy_service.h @@ -18,7 +18,7 @@ #include "chrome_frame/ns_associate_iid_win.h" #include "chrome_frame/ns_isupports_impl.h" #include "chrome_frame/scoped_ns_ptr_win.h" -#include "third_party/WebKit/WebCore/bridge/npapi.h" +#include "third_party/npapi/bindings/npapi.h" #include "third_party/xulrunner-sdk/win/include/xpcom/nsIObserver.h" #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefBranch2.h" #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefService.h" diff --git a/chrome_frame/npapi_url_request.h b/chrome_frame/npapi_url_request.h index 022c048..3c29c73 100644 --- a/chrome_frame/npapi_url_request.h +++ b/chrome_frame/npapi_url_request.h @@ -10,7 +10,7 @@ #include "base/platform_thread.h" #include "chrome_frame/plugin_url_request.h" -#include "third_party/WebKit/WebCore/bridge/npapi.h" +#include "third_party/npapi/bindings/npapi.h" class NPAPIUrlRequest; class NPAPIUrlRequestManager : public PluginUrlRequestManager, |