diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 09:42:01 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 09:42:01 +0000 |
| commit | a4f10c5daca80538c455e013b69b7cdc55be4a62 (patch) | |
| tree | e98cff9b98ce14824cdfcd002498229fede9ea10 /webkit/glue | |
| parent | 64ec916772b1a6c6ef5f162c4edc47eb6b79b90e (diff) | |
| download | chromium_src-a4f10c5daca80538c455e013b69b7cdc55be4a62.zip chromium_src-a4f10c5daca80538c455e013b69b7cdc55be4a62.tar.gz chromium_src-a4f10c5daca80538c455e013b69b7cdc55be4a62.tar.bz2 | |
Include the tab IDs in onBeforeRetarget events and always post the correct frame ID.
Also, we only send the onBeforeRetarget event if the URL is opened from within the web page, but not the chrome (incl. infobars)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7343014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/context_menu.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/context_menu.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/context_menu.cc b/webkit/glue/context_menu.cc index 2363a97..f7f959f 100644 --- a/webkit/glue/context_menu.cc +++ b/webkit/glue/context_menu.cc @@ -22,6 +22,7 @@ ContextMenuParams::ContextMenuParams() x(0), y(0), is_image_blocked(false), + frame_id(0), media_flags(0), spellcheck_enabled(false), is_editable(false), @@ -39,6 +40,7 @@ ContextMenuParams::ContextMenuParams(const WebKit::WebContextMenuData& data) page_url(data.pageURL), keyword_url(data.keywordURL), frame_url(data.frameURL), + frame_id(0), media_flags(data.mediaFlags), selection_text(data.selectedText), misspelled_word(data.misspelledWord), diff --git a/webkit/glue/context_menu.h b/webkit/glue/context_menu.h index 3a70bbd..6837859 100644 --- a/webkit/glue/context_menu.h +++ b/webkit/glue/context_menu.h @@ -73,6 +73,9 @@ struct ContextMenuParams { // This is the URL of the subframe that the context menu was invoked on. GURL frame_url; + // This is the ID of the subframe that the context menu was invoked on. + int64 frame_id; + // This is the history item state of the subframe that the context menu was // invoked on. std::string frame_content_state; |