Fix keyword search erroneously not triggering in two obscure cases:

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc

 // 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/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
@@ skipping 706 matching lines @@
   const bool selection_differs =
       ((new_sel.cp_min != new_sel.cp_max) ||
        (sel_before_change_.cp_min != sel_before_change_.cp_max)) &&
       ((new_sel.cp_min != sel_before_change_.cp_min) ||
        (new_sel.cp_max != sel_before_change_.cp_max));
   const bool at_end_of_edit =
       (new_sel.cp_min == length && new_sel.cp_max == length);
 
   // See if the text or selection have changed since OnBeforePossibleChange().
   const string16 new_text(GetText());
-  text_changed_ = (new_text != text_before_change_);
-  if (supports_pre_edit_) {
-    text_changed_ =
-        text_changed_ || (pre_edit_.size() != pre_edit_size_before_change_);
-  }
+  text_changed_ = (new_text != text_before_change_) || (supports_pre_edit_ &&
+      (pre_edit_.size() != pre_edit_size_before_change_));
 
   if (text_changed_)
     AdjustTextJustification();
 
   // When the user has deleted text, we don't allow inline autocomplete.  Make
   // sure to not flag cases like selecting part of the text and then pasting
   // (or typing) the prefix of that selection.  (We detect these by making
   // sure the caret, which should be after any insertion, hasn't moved
   // forward of the old selection start.)
   const bool just_deleted_text =
       (text_before_change_.length() > new_text.length()) &&
       (new_sel.cp_min <= std::min(sel_before_change_.cp_min,
                                  sel_before_change_.cp_max));
 
   delete_at_end_pressed_ = false;
 
   const bool something_changed = model_->OnAfterPossibleChange(
-      new_text, new_sel.selection_min(), new_sel.selection_max(),
-      selection_differs, text_changed_, just_deleted_text,
-      !IsImeComposing());
+      text_before_change_, new_text, new_sel.selection_min(),
+      new_sel.selection_max(), selection_differs, text_changed_,
+      just_deleted_text, !IsImeComposing());
 
   // If only selection was changed, we don't need to call |controller_|'s
   // OnChanged() method, which is called in TextChanged().
   // But we still need to call EmphasizeURLComponents() to make sure the text
   // attributes are updated correctly.
   if (something_changed && text_changed_) {
     TextChanged();
   } else if (selection_differs) {
     EmphasizeURLComponents();
   } else if (delete_was_pressed_ && at_end_of_edit) {
@@ skipping 1665 matching lines @@
 
   // Make all the children of the widget visible. NOTE: this won't display
   // anything, it just toggles the visible flag.
   gtk_widget_show_all(omnibox_view->GetNativeView());
   // Hide the widget. NativeViewHostGtk will make it visible again as necessary.
   gtk_widget_hide(omnibox_view->GetNativeView());
 
   return omnibox_view;
 }
 #endif