| Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/location_bar/location_bar_view.cc (revision 119905)
|
| +++ chrome/browser/ui/views/location_bar/location_bar_view.cc (working copy)
|
| @@ -1017,10 +1017,9 @@
|
| bool LocationBarView::SkipDefaultKeyEventProcessing(
|
| const views::KeyEvent& event) {
|
| #if defined(OS_WIN)
|
| - bool views_omnibox = views::Widget::IsPureViews();
|
| if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
|
| - if (HasValidSuggestText()) {
|
| - // Return true so that the edit sees the tab and commits the suggestion.
|
| + if (location_entry_->model()->popup_model()->IsOpen()) {
|
| + // Return true so that the edit sees the tab and moves the selection.
|
| return true;
|
| }
|
| if (keyword_hint_view_->visible() && !event.IsShiftDown()) {
|
| @@ -1028,12 +1027,6 @@
|
| return true;
|
| }
|
|
|
| -#if !defined(USE_AURA)
|
| - // If the caret is not at the end, then tab moves the caret to the end.
|
| - if (!views_omnibox && !GetOmniboxViewWin()->IsCaretAtEnd())
|
| - return true;
|
| -#endif
|
| -
|
| // Tab while showing instant commits instant immediately.
|
| // Return true so that focus traversal isn't attempted. The edit ends
|
| // up doing nothing in this case.
|
| @@ -1042,7 +1035,7 @@
|
| }
|
|
|
| #if !defined(USE_AURA)
|
| - if (!views_omnibox)
|
| + if (!views::Widget::IsPureViews())
|
| return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
|
| #endif
|
| NOTIMPLEMENTED();
|
|
|