| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 // Record this paste, so we can do different behavior. | 385 // Record this paste, so we can do different behavior. |
| 386 model()->OnPaste(); | 386 model()->OnPaste(); |
| 387 // Force a Paste operation to trigger the text_changed code in | 387 // Force a Paste operation to trigger the text_changed code in |
| 388 // OnAfterPossibleChange(), even if identical contents are pasted. | 388 // OnAfterPossibleChange(), even if identical contents are pasted. |
| 389 text_before_change_.clear(); | 389 text_before_change_.clear(); |
| 390 InsertOrReplaceText(text); | 390 InsertOrReplaceText(text); |
| 391 } | 391 } |
| 392 } | 392 } |
| 393 | 393 |
| 394 bool OmniboxViewViews::HandleEarlyTabActions(const ui::KeyEvent& event) { | 394 bool OmniboxViewViews::HandleEarlyTabActions(const ui::KeyEvent& event) { |
| 395 // This must run before acclerator handling invokes a focus change on tab. | 395 // This must run before accelerator handling invokes a focus change on tab. |
| 396 // Note the parallel with SkipDefaultKeyEventProcessing above. | 396 // Note the parallel with SkipDefaultKeyEventProcessing above. |
| 397 if (!views::FocusManager::IsTabTraversalKeyEvent(event)) | 397 if (!views::FocusManager::IsTabTraversalKeyEvent(event)) |
| 398 return false; | 398 return false; |
| 399 | 399 |
| 400 if (model()->is_keyword_hint() && !event.IsShiftDown()) { | 400 if (model()->is_keyword_hint() && !event.IsShiftDown()) { |
| 401 model()->AcceptKeyword(ENTERED_KEYWORD_MODE_VIA_TAB); | 401 model()->AcceptKeyword(ENTERED_KEYWORD_MODE_VIA_TAB); |
| 402 return true; | 402 return true; |
| 403 } | 403 } |
| 404 | 404 |
| 405 if (!model()->popup_model()->IsOpen()) | 405 if (!model()->popup_model()->IsOpen()) |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 menu_contents->InsertItemWithStringIdAt( | 1037 menu_contents->InsertItemWithStringIdAt( |
| 1038 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); | 1038 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); |
| 1039 } | 1039 } |
| 1040 | 1040 |
| 1041 // Minor note: We use IDC_ for command id here while the underlying textfield | 1041 // Minor note: We use IDC_ for command id here while the underlying textfield |
| 1042 // is using IDS_ for all its command ids. This is because views cannot depend | 1042 // is using IDS_ for all its command ids. This is because views cannot depend |
| 1043 // on IDC_ for now. | 1043 // on IDC_ for now. |
| 1044 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1044 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
| 1045 IDS_EDIT_SEARCH_ENGINES); | 1045 IDS_EDIT_SEARCH_ENGINES); |
| 1046 } | 1046 } |
| OLD | NEW |