Don't make |field_| first responder in SetSelectedRange() unless |model_| has_focus already.

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 161 matching lines @@
   // after destruction.
   [field_ setDelegate:nil];
 
   // Disconnect notifications so they don't signal a dead object.
   [[NSNotificationCenter defaultCenter] removeObserver:edit_helper_];
 }
 
 void AutocompleteEditViewMac::SaveStateToTab(TabContents* tab) {
   DCHECK(tab);
 
+  const bool hasFocus = [field_ currentEditor] ? true : false;
+
   NSRange range;
-  if (model_->has_focus()) {
+  if (hasFocus) {
     range = GetSelectedRange();
   } else {
     // If we are not focussed, there is no selection.  Manufacture
     // something reasonable in case it starts to matter in the future.
     range = NSMakeRange(0, [[field_ stringValue] length]);
   }
 
   AutocompleteEditViewMacState state(model_->GetStateForTabSwitch(),
-                                     model_->has_focus(), range);
+                                     hasFocus, range);
   StoreStateToTab(tab, state);
 }
 
 void AutocompleteEditViewMac::Update(
     const TabContents* tab_for_state_restoring) {
   // TODO(shess): It seems like if the tab is non-NULL, then this code
   // shouldn't need to be called at all.  When coded that way, I find
   // that the field isn't always updated correctly.  Figure out why
   // this is.  Maybe this method should be refactored into more
   // specific cases.
   const std::wstring text = toolbar_model_->GetText();
   const bool user_visible = model_->UpdatePermanentText(text);
 
   if (tab_for_state_restoring) {
     RevertAll();
 
     const AutocompleteEditViewMacState* state = 
         GetStateFromTab(tab_for_state_restoring);
     if (state) {
       // Should restore the user's text via SetUserText().
       model_->RestoreState(state->model_state);
 
-      // Restore user's selection.
-      // TODO(shess): The model_ does not restore the focus state.  If
-      // field_ was in focus when we switched away, I presume it
-      // should be in focus when we switch back.  Figure out if model_
-      // not restoring focus is an oversight, or intentional for some
-      // subtle reason.
+      // Restore focus and selection if they were present when the tab
+      // was switched away.
       if (state->has_focus) {
-        SetSelectedRange(state->selection);
+        // 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_ 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.
 
   } else {
     // TODO(shess): Figure out how this case is used, to make sure
@@ skipping 38 matching lines @@
     UpdatePopup();
   }
 }
 
 NSRange AutocompleteEditViewMac::GetSelectedRange() const {
   DCHECK([field_ currentEditor]);
   return [[field_ currentEditor] selectedRange];
 }
 
 void AutocompleteEditViewMac::SetSelectedRange(const NSRange range) {
-  // TODO(shess): Check if we should steal focus or not.  We can't set
-  // the selection without focus, though.
-  FocusLocation();
+  if (model_->has_focus()) {
+    // TODO(shess): This should not be necessary.  Try to convert to
+    // DCHECK(IsFirstResponder()).
+    FocusLocation();
 
-  // 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];
+    // 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,
                                                        size_t caret_pos) {
   DCHECK_LE(caret_pos, text.size());
   UpdateAndStyleText(text);
   SetSelectedRange(NSMakeRange(caret_pos, caret_pos));
 }
 
 void AutocompleteEditViewMac::SelectAll(bool reversed) {
@@ skipping 306 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