Chromium Code Reviews| Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
| diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
| index 751ef89474793eec231cadc88bfa6c0baf1dadaf..abb92ffc7dec78fc5615ad943699454d160df95b 100644 |
| --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
| +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
| @@ -369,8 +369,6 @@ void OmniboxViewMac::ApplyCaretVisibility() { |
| } |
| void OmniboxViewMac::SetText(const string16& display_text) { |
| - // If we are setting the text directly, there cannot be any suggest text. |
| - SetInstantSuggestion(string16()); |
| SetTextInternal(display_text); |
| } |
| @@ -495,7 +493,6 @@ void OmniboxViewMac::OnTemporaryTextMaybeChanged(const string16& display_text, |
| if (save_original_selection) |
| saved_temporary_selection_ = GetSelectedRange(); |
| - SetInstantSuggestion(string16()); |
| SetWindowTextAndCaretPos(display_text, display_text.size(), false, false); |
| if (notify_text_changed) |
| model()->OnChanged(); |
| @@ -503,10 +500,6 @@ void OmniboxViewMac::OnTemporaryTextMaybeChanged(const string16& display_text, |
| } |
| void OmniboxViewMac::OnStartingIME() { |
|
Peter Kasting
2013/04/03 00:35:35
Can this function be eliminated entirely?
sail
2013/04/03 19:34:11
Done.
Good idea.
|
| - // Reset the suggest text just before starting an IME composition session, |
| - // otherwise the IME composition may be interrupted when the suggest text |
| - // gets reset by the IME composition change. |
| - SetInstantSuggestion(string16()); |
| } |
| bool OmniboxViewMac::OnInlineAutocompleteTextMaybeChanged( |
| @@ -648,15 +641,6 @@ void OmniboxViewMac::OnDidEndEditing() { |
| } |
| bool OmniboxViewMac::OnDoCommandBySelector(SEL cmd) { |
| - if (cmd != @selector(moveRight:) && |
| - cmd != @selector(insertTab:) && |
| - cmd != @selector(insertTabIgnoringFieldEditor:)) { |
| - // Reset the suggest text for any change other than key right or tab. |
| - // TODO(rohitrao): This is here to prevent complications when editing text. |
| - // See if this can be removed. |
| - SetInstantSuggestion(string16()); |
| - } |
| - |
| if (cmd == @selector(deleteForward:)) |
| delete_was_pressed_ = true; |