Omnibox: don't assume omnibox has focus in OnAfterPossibleChange().

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 1014 matching lines @@
   // Update the paste state as appropriate: if we're just finishing a paste
   // that replaced all the text, preserve that information; otherwise, if we've
   // made some other edit, clear paste tracking.
   if (paste_state_ == PASTING)
     paste_state_ = PASTED;
   else if (text_differs)
     paste_state_ = NONE;
 
   if (text_differs || selection_differs) {
     // Record current focus state for this input if we haven't already.
-    DCHECK_NE(OMNIBOX_FOCUS_NONE, focus_state_);

[Peter Kasting, 2013/08/12 18:58:15]

You should comment about Linux' dumb behavior here.  Better yet, can we make it
so the paste action on Linux gives the omnibox focus before we reach this point?

[samarth, 2013/08/12 19:13:40]

Added comment and crbug.com/271590.  I'll fix Linux in a follow-up.

     if (focus_source_ == INVALID) {
-      focus_source_ = (focus_state_ == OMNIBOX_FOCUS_VISIBLE) ?
-          OMNIBOX : FAKEBOX;
+      focus_source_ = (focus_state_ == OMNIBOX_FOCUS_INVISIBLE) ?
+          FAKEBOX : OMNIBOX;
     }
 
     // Restore caret visibility whenever the user changes text or selection in
     // the omnibox.
     SetFocusState(OMNIBOX_FOCUS_VISIBLE, OMNIBOX_FOCUS_CHANGE_TYPING);
   }
 
   // Modifying the selection counts as accepting the autocompleted text.
   const bool user_text_changed =
       text_differs || (selection_differs && !inline_autocomplete_text_.empty());
@@ skipping 272 matching lines @@
     instant->OmniboxFocusChanged(state, reason, NULL);
 
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 }