summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_activex.h
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 00:53:23 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 00:53:23 +0000
commita1800e8c451736dea5663ae461454ab663d05bc4 (patch)
tree87ff9157562b9616139bb6154a06902e5ede5287 /chrome_frame/chrome_frame_activex.h
parent4f03cbccc4c09db3f053b74393961e8728bceeec (diff)
downloadchromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.zip
chromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.tar.gz
chromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.tar.bz2
Back/Forward support for url fragments
Added support for anchor (url fragments). this involves mainly implementing IPersistHistory. The rest of the stuff is a song and dance to get called in IPersistHistory in the first place and then behave correctly when we do. BUG=23981 TEst=unit tests added and back forward with '#' URLs, sub frames etc. Review URL: http://codereview.chromium.org/371004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.h')
-rw-r--r--chrome_frame/chrome_frame_activex.h26
1 files changed, 6 insertions, 20 deletions
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h
index 04169af..1acbc37 100644
--- a/chrome_frame/chrome_frame_activex.h
+++ b/chrome_frame/chrome_frame_activex.h
@@ -80,30 +80,22 @@ END_MSG_MAP()
STDMETHOD(put_src)(BSTR src);
protected:
+ // ChromeFrameDelegate overrides
virtual void OnLoad(int tab_handle, const GURL& url);
virtual void OnMessageFromChromeFrame(int tab_handle,
const std::string& message,
const std::string& origin,
const std::string& target);
+ virtual void OnLoadFailed(int error_code, const std::string& url);
+ virtual void OnAutomationServerLaunchFailed(
+ AutomationLaunchResult reason, const std::string& server_version);
+ virtual void OnExtensionInstalled(const FilePath& path,
+ void* user_data, AutomationMsg_ExtensionResponseValues response);
private:
-
LRESULT OnCreate(UINT message, WPARAM wparam, LPARAM lparam,
BOOL& handled); // NO_LINT
- // ChromeFrameDelegate overrides
- virtual void ChromeFrameActivex::OnAutomationServerLaunchFailed(
- AutomationLaunchResult reason, const std::string& server_version);
- virtual void OnLoadFailed(int error_code, const std::string& url);
- virtual void OnExtensionInstalled(const FilePath& path,
- void* user_data, AutomationMsg_ExtensionResponseValues response);
-
- // Helper function to execute a function on a script IDispatch interface.
- HRESULT InvokeScriptFunction(const VARIANT& script, const std::string& param);
- HRESULT InvokeScriptFunction(const VARIANT& script, VARIANT* param);
- HRESULT InvokeScriptFunction(const VARIANT& script,
- VARIANT* param,
- int param_count);
HRESULT GetContainingDocument(IHTMLDocument2** doc);
HRESULT GetDocumentWindow(IHTMLWindow2** window);
@@ -119,12 +111,6 @@ END_MSG_MAP()
BSTR instance_id, BSTR script,
BSTR event_name);
- // Creates a new event object that supports the |data| property.
- // Note: you should supply an empty string for |origin| unless you're
- // creating a "message" event.
- HRESULT CreateDomEvent(const std::string& event_type, const std::string& data,
- const std::string& origin, IDispatch** event);
-
// Utility function that checks the size of the vector and if > 0 creates
// a variant for the string argument and forwards the call to the other
// FireEvent method.