diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-25 17:21:02 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-25 17:21:02 +0000 |
| commit | 6df30afbe287a948fd7f229029e6ec8e88d2735a (patch) | |
| tree | ff6f7b59075d39b10be1a0c045a04b891cd05df3 /chrome_frame/chrome_frame_npapi.cc | |
| parent | 23ecd53031047f8e19363e92dcc8eccbaf121665 (diff) | |
| download | chromium_src-6df30afbe287a948fd7f229029e6ec8e88d2735a.zip chromium_src-6df30afbe287a948fd7f229029e6ec8e88d2735a.tar.gz chromium_src-6df30afbe287a948fd7f229029e6ec8e88d2735a.tar.bz2 | |
Fixes for the chrome frame npapi test failures seen on the builders. These failures occurred
after the change to clean up chrome frame automation code.
BUG=none
TEST=ChromeFrame firefox tests should pass.
TBR=jam
Review URL: http://codereview.chromium.org/6055008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_npapi.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_npapi.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index a010fac..5716801 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -429,8 +429,7 @@ void ChromeFrameNPAPI::UrlNotify(const char* url, NPReason reason, url_fetcher_.UrlNotify(url, reason, notify_data); } -void ChromeFrameNPAPI::OnAcceleratorPressed(int tab_handle, - const MSG& accel_message) { +void ChromeFrameNPAPI::OnAcceleratorPressed(const MSG& accel_message) { DVLOG(1) << __FUNCTION__ << " msg:" << base::StringPrintf("0x%04X", accel_message.message) << " key:" << accel_message.wParam; @@ -460,7 +459,7 @@ void ChromeFrameNPAPI::OnAcceleratorPressed(int tab_handle, } } -void ChromeFrameNPAPI::OnTabbedOut(int tab_handle, bool reverse) { +void ChromeFrameNPAPI::OnTabbedOut(bool reverse) { DVLOG(1) << __FUNCTION__; ignore_setfocus_ = true; @@ -477,8 +476,7 @@ void ChromeFrameNPAPI::OnTabbedOut(int tab_handle, bool reverse) { ignore_setfocus_ = false; } -void ChromeFrameNPAPI::OnOpenURL(int tab_handle, - const GURL& url, +void ChromeFrameNPAPI::OnOpenURL(const GURL& url, const GURL& referrer, int open_disposition) { std::string target; @@ -805,7 +803,7 @@ void ChromeFrameNPAPI::OnBlur() { DVLOG(1) << __FUNCTION__; } -void ChromeFrameNPAPI::OnLoad(int, const GURL& gurl) { +void ChromeFrameNPAPI::OnLoad(const GURL& gurl) { DVLOG(1) << "Firing onload"; FireEvent("load", gurl.spec()); } @@ -817,8 +815,7 @@ void ChromeFrameNPAPI::OnLoadFailed(int error_code, const std::string& url) { InvokeDefault(onerror_handler_, url, &result); } -void ChromeFrameNPAPI::OnMessageFromChromeFrame(int tab_handle, - const std::string& message, +void ChromeFrameNPAPI::OnMessageFromChromeFrame(const std::string& message, const std::string& origin, const std::string& target) { bool private_message = false; |