Querying for one more interface to handle IE8 on XP case. This is what we were hitting on the builder.

R=ananta
BUG=none
TEST=Run all unit tests.  This is a second attempt to switch to onhttpequiv.

Review URL: http://codereview.chromium.org/543017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36009 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 26 deletions

diff --git a/chrome_frame/extra_system_apis.h b/chrome_frame/extra_system_apis.h
index 724b0c8f..c951c10 100644
--- a/chrome_frame/extra_system_apis.h
+++ b/chrome_frame/extra_system_apis.h
@@ -48,37 +48,15 @@ IWebBrowserPriv : public IUnknown {
   STDMETHOD(OnClose)();
 };
 
-// Web browser methods that are used by MSHTML when navigating or
-// initiating downloads.  IE7.
-class __declspec(uuid("{1AF32B6C-A3BA-48B9-B24E-8AA9C41F6ECD}"))
-IWebBrowserPriv2IE7 : public IUnknown {
- public:
-  STDMETHOD(NavigateWithBindCtx2)(IUri* uri, VARIANT* flags,
-                                  VARIANT* target_frame, VARIANT* post_data,
-                                  VARIANT* headers, IBindCtx* bind_ctx,
-                                  LPOLESTR url_fragment);
-  STDMETHOD(SetBrowserFrameOptions)(DWORD opt1, DWORD opt2);
-  STDMETHOD(DetachConnectionPoints)();
-};
-
-// Web browser methods that are used by MSHTML when navigating or
-// initiating downloads.  IE8 uses IID {3ED72303-6FFC-4214-BA90-FAF1862DEC8A}
-// whereas the IID is {1AF32B6C-A3BA-48B9-B24E-8AA9C41F6ECD} in IE7
-class __declspec(uuid("{3ED72303-6FFC-4214-BA90-FAF1862DEC8A}"))
-IWebBrowserPriv2IE8 : public IUnknown {
+// The common denominator for IE7 and IE8 versions.  There's no specific IID
+// here since all apply.  We use this interface for simplicities sake as all we
+// want to do is invoke the NavigateWithBindCtx2 method.
+class IWebBrowserPriv2Common : public IUnknown {
  public:
   STDMETHOD(NavigateWithBindCtx2)(IUri* uri, VARIANT* flags,
                                   VARIANT* target_frame, VARIANT* post_data,
                                   VARIANT* headers, IBindCtx* bind_ctx,
                                   LPOLESTR url_fragment);
-  STDMETHOD(SetBrowserFrameOptions)(DWORD opt1, DWORD opt2);
-  STDMETHOD(DetachConnectionPoints)();
-  STDMETHOD(GetProcessId)(DWORD* pid);
-  STDMETHOD(CompatAttachEditEvents)();
-  STDMETHOD(HandleOpenOptions)(IUnknown* obj, BSTR bstr, int options);
-  STDMETHOD(SetSearchTerm)(BSTR term);
-  STDMETHOD(GetSearchTerm)(BSTR* term);
-  STDMETHOD(GetCurrentDocument)(IDispatch** doc);
 };
 
 // This interface is used to call FireBeforeNavigate with additional