[Mac] Remove guard on FocusLocation() in autocomplete field.

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
@@ skipping 205 matching lines @@
 
       // Restore focus and selection if they were present when the tab
       // was switched away.
       if (state->has_focus) {
         // TODO(shess): Unfortunately, there is no safe way to update
         // this because TabStripController -selectTabWithContents:* is
         // also messing with focus.  Both parties need to agree to
         // store existing state before anyone tries to setup the new
         // state.  Anyhow, it would look something like this.
 #if 0
-        FocusLocation();
-
-        // Must restore directly to evade model_->has_focus() guard.
+        [[field_ window] makeFirstResponder:field_];
         [[field_ currentEditor] setSelectedRange:state->selection];
 #endif
       }
     }
   } else if (user_visible) {
     // Restore everything to the baseline look.
     RevertAll();
     // TODO(shess): Figure out how this case is used, to make sure
     // we're getting the selection and popup right.
 
@@ skipping 49 matching lines @@
   DCHECK([field_ currentEditor]);
   return [[field_ currentEditor] selectedRange];
 }
 
 void AutocompleteEditViewMac::SetSelectedRange(const NSRange range) {
   // This can be called when we don't have focus.  For instance, when
   // the user clicks the "Go" button.
   if (model_->has_focus()) {
     // TODO(shess): If |model_| thinks we have focus, this should not
     // be necessary.  Try to convert to DCHECK(IsFirstResponder()).
-    FocusLocation();
+    if (![field_ currentEditor]) {
+      [[field_ window] makeFirstResponder:field_];
+    }
 
     // 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 AutocompleteEditViewMac::SetWindowTextAndCaretPos(const std::wstring& text,
@@ skipping 233 matching lines @@
 void AutocompleteEditViewMac::OnDidResignKey() {
   ClosePopup();
 }
 
 void AutocompleteEditViewMac::AcceptInput(
     WindowOpenDisposition disposition, bool for_drop) {
   model_->AcceptInput(disposition, for_drop);
 }
 
 void AutocompleteEditViewMac::FocusLocation() {
-  // -makeFirstResponder: will select the entire field_.  If we're
-  // already firstResponder, it's likely that we want to retain the
-  // current selection.
-  if (![field_ currentEditor]) {
-    [[field_ window] makeFirstResponder:field_];
-    DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
-  }
+  [[field_ window] makeFirstResponder:field_];
+  DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
 }
 
 @implementation AutocompleteFieldDelegate
 
 - initWithEditView:(AutocompleteEditViewMac*)view {
   self = [super init];
   if (self) {
     edit_view_ = view;
   }
   return self;
@@ skipping 58 matching lines @@
   // TODO(shess): Figure out where the selection belongs.  On GTK,
   // it's set to the start of the text.
 }
 
 // Signal that we've lost focus when the window resigns key.
 - (void)windowDidResignKey:(NSNotification*)notification {
   edit_view_->OnDidResignKey();
 }
 
 @end