diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 22:15:34 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 22:15:34 +0000 |
| commit | f5494d49ab74e3d116540b14db3457558f54c88e (patch) | |
| tree | beb367c01c187652d02091a5067a69d5bc0fa064 /chrome_frame/chrome_frame_activex.h | |
| parent | a9f39a313b7ecc11d98727d869e15094481f3a65 (diff) | |
| download | chromium_src-f5494d49ab74e3d116540b14db3457558f54c88e.zip chromium_src-f5494d49ab74e3d116540b14db3457558f54c88e.tar.gz chromium_src-f5494d49ab74e3d116540b14db3457558f54c88e.tar.bz2 | |
Clean up Automation and Chrome Frame IPC code.-only use routed messages when needed-use routing IDs to avoid manually unpacking messages-remove data structures from IPC namespace (that should only be used for IPC code, and param traits)Note that I temporarily commented out part of a test in external_tab_test.cc because I couldn't figure out how to get the updated gmock macros to compile.
Review URL: http://codereview.chromium.org/5998006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.h')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h index 8fee559..bbad3e8 100644 --- a/chrome_frame/chrome_frame_activex.h +++ b/chrome_frame/chrome_frame_activex.h @@ -90,9 +90,8 @@ END_MSG_MAP() protected: // ChromeFrameDelegate overrides - virtual void OnLoad(int tab_handle, const GURL& url); - virtual void OnMessageFromChromeFrame(int tab_handle, - const std::string& message, + virtual void OnLoad(const GURL& url); + virtual void OnMessageFromChromeFrame(const std::string& message, const std::string& origin, const std::string& target); virtual void OnLoadFailed(int error_code, const std::string& url); |