Honor the select_all argument to AutocompleteEditViewMac::FocusLocation

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2010 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 <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 866 matching lines @@
   // beginning of the text.  Delete the selected keyword.
   model_->ClearKeyword(GetText());
   return true;
 }
 
 void AutocompleteEditViewMac::OnControlKeyChanged(bool pressed) {
   model_->OnControlKeyChanged(pressed);
 }
 
 void AutocompleteEditViewMac::FocusLocation(bool select_all) {
-  // TODO(pkasting): Figure out Mac's weird focus-handling and do the right
-  // thing here :(
   if ([field_ isEditable]) {
-    [[field_ window] makeFirstResponder:field_];
+    // If the text field has a field editor, it's the first responder, meaning
+    // that it's already focused. makeFirstResponder: will select all, so only
+    // call it if this behavior is desired.
+    if (select_all || ![field_ currentEditor])
+      [[field_ window] makeFirstResponder:field_];
     DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
   }
 }
 
 // TODO(shess): Copied from autocomplete_edit_view_win.cc.  Could this
 // be pushed into the model?
 std::wstring AutocompleteEditViewMac::GetClipboardText(Clipboard* clipboard) {
   // autocomplete_edit_view_win.cc assumes this can never happen, we
   // will too.
   DCHECK(clipboard);
@@ skipping 25 matching lines @@
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid()) {
       return UTF8ToWide(url.spec());
     }
   }
 
   return std::wstring();
 }