diff options
author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 00:39:13 +0000 |
---|---|---|
committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 00:39:13 +0000 |
commit | b3996ba1c1d6d4ece36bc0c695ca81f6a56572b2 (patch) | |
tree | 26e3b76ff229074beabc24293543884c04559499 /chrome/browser/debugger | |
parent | 55ce288f21207b58778bbd39b171eb02ed62be95 (diff) | |
download | chromium_src-b3996ba1c1d6d4ece36bc0c695ca81f6a56572b2.zip chromium_src-b3996ba1c1d6d4ece36bc0c695ca81f6a56572b2.tar.gz chromium_src-b3996ba1c1d6d4ece36bc0c695ca81f6a56572b2.tar.bz2 |
Add WebContents* to some more delegate methods
This are required to identify the correct java peer-object on Android
BUG=
Review URL: https://chromiumcodereview.appspot.com/10837112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
-rw-r--r-- | chrome/browser/debugger/devtools_window.cc | 4 | ||||
-rw-r--r-- | chrome/browser/debugger/devtools_window.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 536b3b6..2de9c7d 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -589,6 +589,7 @@ void DevToolsWindow::AddNewContents(WebContents* source, } bool DevToolsWindow::PreHandleKeyboardEvent( + content::WebContents* source, const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) { if (docked_) { BrowserWindow* inspected_window = GetInspectedBrowserWindow(); @@ -599,7 +600,8 @@ bool DevToolsWindow::PreHandleKeyboardEvent( return false; } -void DevToolsWindow::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) { +void DevToolsWindow::HandleKeyboardEvent(content::WebContents* source, + const NativeWebKeyboardEvent& event) { if (docked_) { if (event.windowsKeyCode == 0x08) { // Do not navigate back in history on Windows (http://crbug.com/74156). diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 6fba5a8..dfe73ab 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -115,9 +115,11 @@ class DevToolsWindow : private content::NotificationObserver, bool user_gesture) OVERRIDE; virtual void CloseContents(content::WebContents* source) OVERRIDE {} virtual bool PreHandleKeyboardEvent( + content::WebContents* source, const content::NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) OVERRIDE; virtual void HandleKeyboardEvent( + content::WebContents* source, const content::NativeWebKeyboardEvent& event) OVERRIDE; virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE; |