Revert 120018 - Revert 120005 - Enabled pressing TAB to traverse through the Omnibox results, rem...

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/property_bag.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 310 matching lines @@
 void OmniboxViewMac::SetUserText(const string16& text) {
   SetUserText(text, text, true);
 }
 
 void OmniboxViewMac::SetUserText(const string16& text,
                                  const string16& display_text,
                                  bool update_popup) {
   model_->SetUserText(text);
   // TODO(shess): TODO below from gtk.
   // TODO(deanm): something about selection / focus change here.
-  SetText(display_text);
-  if (update_popup) {
-    UpdatePopup();
-  }
-  model_->OnChanged();
+  SetWindowTextAndCaretPos(display_text, display_text.length(), update_popup,
+      true);
 }
 
 NSRange OmniboxViewMac::GetSelectedRange() const {
   return [[field_ currentEditor] selectedRange];
 }
 
 NSRange OmniboxViewMac::GetMarkedRange() const {
   DCHECK([field_ currentEditor]);
   return [(NSTextView*)[field_ currentEditor] markedRange];
 }
@@ skipping 10 matching lines @@
 
     // TODO(shess): What if it didn't get first responder, and there is
     // no field editor?  This will do nothing.  Well, at least it won't
     // crash.  Think of something more productive to do, or prove that
     // it cannot occur and DCHECK appropriately.
     [[field_ currentEditor] setSelectedRange:range];
   }
 }
 
 void OmniboxViewMac::SetWindowTextAndCaretPos(const string16& text,
-                                              size_t caret_pos) {
+                                              size_t caret_pos,
+                                              bool update_popup,
+                                              bool notify_text_changed) {
   DCHECK_LE(caret_pos, text.size());
   SetTextAndSelectedRange(text, NSMakeRange(caret_pos, caret_pos));
+
+  if (update_popup)
+    UpdatePopup();
+
+  if (notify_text_changed)
+    TextChanged();
 }
 
 void OmniboxViewMac::SetForcedQuery() {
   // We need to do this first, else |SetSelectedRange()| won't work.
   FocusLocation(true);
 
   const string16 current_text(GetText());
   const size_t start = current_text.find_first_not_of(kWhitespaceUTF16);
   if (start == string16::npos || (current_text[start] != '?')) {
     SetUserText(ASCIIToUTF16("?"));
@@ skipping 145 matching lines @@
     [storage setAttributes:[NSDictionary dictionary]
                      range:NSMakeRange(0, [storage length])];
     ApplyTextAttributes(GetText(), storage);
 
     [storage endEditing];
   } else {
     SetText(GetText());
   }
 }
 
+void OmniboxViewMac::TextChanged() {
+  EmphasizeURLComponents();
+  model_->OnChanged();
+}
+
 void OmniboxViewMac::ApplyTextAttributes(const string16& display_text,
                                          NSMutableAttributedString* as) {
   NSUInteger as_length = [as length];
   NSRange as_entire_string = NSMakeRange(0, as_length);
 
   [as addAttribute:NSFontAttributeName value:GetFieldFont()
              range:as_entire_string];
 
   // A kinda hacky way to add breaking at periods. This is what Safari does.
   // This works for IDNs too, despite the "en_US".
@@ skipping 54 matching lines @@
                range:ComponentToNSRange(scheme)];
   }
 }
 
 void OmniboxViewMac::OnTemporaryTextMaybeChanged(const string16& display_text,
                                                  bool save_original_selection) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelectedRange();
 
   suggest_text_length_ = 0;
-  SetWindowTextAndCaretPos(display_text, display_text.size());
+  SetWindowTextAndCaretPos(display_text, display_text.size(), false, false);
   model_->OnChanged();
   [field_ clearUndoChain];
 }
 
 void OmniboxViewMac::OnStartingIME() {
   // 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(), false);
 }
@@ skipping 71 matching lines @@
       !IsImeComposing());
 
   if (delete_was_pressed_ && at_end_of_edit)
     delete_at_end_pressed_ = true;
 
   // Restyle in case the user changed something.
   // TODO(shess): I believe there are multiple-redraw cases, here.
   // Linux watches for something_changed && text_differs, but that
   // fails for us in case you copy the URL and paste the identical URL
   // back (we'll lose the styling).
-  EmphasizeURLComponents();
-  model_->OnChanged();
+  TextChanged();
 
   delete_was_pressed_ = false;
 
   return something_changed;
 }
 
 gfx::NativeView OmniboxViewMac::GetNativeView() const {
   return field_;
 }
 
@@ skipping 73 matching lines @@
       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(), false);
   }
 
   if (cmd == @selector(deleteForward:))
     delete_was_pressed_ = true;
 
-  // Don't intercept up/down-arrow if the popup isn't open.
+  // Don't intercept up/down-arrow or backtab if the popup isn't open.
   if (popup_view_->IsOpen()) {
     if (cmd == @selector(moveDown:)) {
       model_->OnUpOrDownKeyPressed(1);
       return true;
     }
 
     if (cmd == @selector(moveUp:)) {
       model_->OnUpOrDownKeyPressed(-1);
       return true;
     }
+
+    if (cmd == @selector(insertBacktab:) &&
+        model_->popup_model()->selected_line_state() ==
+            AutocompletePopupModel::KEYWORD) {
+      model_->ClearKeyword(GetText());
+      return true;
+    }
   }
 
   if (cmd == @selector(moveRight:)) {
     // Only commit suggested text if the cursor is all the way to the right and
     // there is no selection.
     if (suggest_text_length_ > 0 && IsCaretAtEnd()) {
       model_->CommitSuggestedText(true);
       return true;
     }
   }
 
   if (cmd == @selector(scrollPageDown:)) {
     model_->OnUpOrDownKeyPressed(model_->result().size());
     return true;
   }
 
   if (cmd == @selector(scrollPageUp:)) {
     model_->OnUpOrDownKeyPressed(-model_->result().size());
     return true;
   }
 
   if (cmd == @selector(cancelOperation:)) {
     return model_->OnEscapeKeyPressed();
   }
 
-  if (cmd == @selector(insertTab:) ||
-      cmd == @selector(insertTabIgnoringFieldEditor:)) {
-    if (model_->is_keyword_hint())
-      return model_->AcceptKeyword();
-
-    if (suggest_text_length_ > 0) {
-      model_->CommitSuggestedText(true);
-      return true;
-    }
-
-    if (!IsCaretAtEnd()) {
-      PlaceCaretAt(GetTextLength());
-      // OnDidChange() will not be triggered when setting selected range in this
-      // method, so we need to call it explicitly.
-      OnDidChange();
-      return true;
-    }
-
-    if (model_->AcceptCurrentInstantPreview())
-      return true;
+  if ((cmd == @selector(insertTab:) ||
+      cmd == @selector(insertTabIgnoringFieldEditor:)) &&
+      model_->is_keyword_hint()) {
+    return model_->AcceptKeyword();
   }
 
   // |-noop:| is sent when the user presses Cmd+Return. Override the no-op
   // behavior with the proper WindowOpenDisposition.
   NSEvent* event = [NSApp currentEvent];
   if (cmd == @selector(insertNewline:) ||
      (cmd == @selector(noop:) &&
       ([event type] == NSKeyDown || [event type] == NSKeyUp) &&
       [event keyCode] == kVK_Return)) {
     WindowOpenDisposition disposition =
@@ skipping 263 matching lines @@
 
 void OmniboxViewMac::PlaceCaretAt(NSUInteger pos) {
   DCHECK(pos <= GetTextLength());
   SetSelectedRange(NSMakeRange(pos, pos));
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return selection.length == 0 && selection.location == GetTextLength();
 }