Commit e12ac758 authored by manuk's avatar manuk Committed by Commit Bot

[Omnibox] Prevent displaying popup results when page up or down keys are pressed in a popup window.

Bug: 865611
Change-Id: I8f527872ea1916ea326c1e44e3d6fd1361eab3f6
Reviewed-on: https://chromium-review.googlesource.com/1195810Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: manuk hovanesian <manukh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587291}
parent 940b87bb
......@@ -1283,13 +1283,13 @@ bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
break;
case ui::VKEY_PRIOR:
if (control || alt || shift)
if (control || alt || shift || read_only())
return false;
model()->OnUpOrDownKeyPressed(-1 * model()->result().size());
return true;
case ui::VKEY_NEXT:
if (control || alt || shift)
if (control || alt || shift || read_only())
return false;
model()->OnUpOrDownKeyPressed(model()->result().size());
return true;
......@@ -1377,8 +1377,7 @@ bool OmniboxViewViews::HandleKeyEvent(views::Textfield* textfield,
break;
case ui::VKEY_SPACE:
if (!(control || alt || shift))
{
if (!(control || alt || shift)) {
size_t start, end;
GetSelectionBounds(&start, &end);
end = std::max(start, end);
......@@ -1464,8 +1463,8 @@ int OmniboxViewViews::OnDrop(const ui::OSExchangeData& data) {
if (data.HasURL(ui::OSExchangeData::CONVERT_FILENAMES)) {
GURL url;
base::string16 title;
if (data.GetURLAndTitle(
ui::OSExchangeData::CONVERT_FILENAMES, &url, &title)) {
if (data.GetURLAndTitle(ui::OSExchangeData::CONVERT_FILENAMES, &url,
&title)) {
text = StripJavascriptSchemas(base::UTF8ToUTF16(url.spec()));
}
} else if (data.HasString() && data.GetString(&text)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment