Call CancelComposition() in SaveStateToTab().

chrome/browser/ui/views/omnibox/omnibox_view_views.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/views/omnibox/omnibox_view_views.h"
 
 #include "base/property_bag.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 20 matching lines @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/events/event.h"
+#include "ui/views/ime/input_method.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
 #endif
 
 using content::WebContents;
 
 namespace {
@@ skipping 318 matching lines @@
 const AutocompleteEditModel* OmniboxViewViews::model() const {
   return model_.get();
 }
 
 void OmniboxViewViews::SaveStateToTab(WebContents* tab) {
   DCHECK(tab);
 
   // We don't want to keep the IME status, so force quit the current
   // session here.  It may affect the selection status, so order is
   // also important.
-  // This actually doesn't notify any events to the input method, but
-  // further call of SetText() will notify the current status, so
-  // that's fine.
-  // TODO(mukai): Add a method to InputMethod class to deal with such
-  // situation.  http://crbug.com/111578
-  if (textfield_->IsIMEComposing())
+  if (textfield_->IsIMEComposing()) {
     textfield_->GetTextInputClient()->ConfirmCompositionText();
+    textfield_->GetInputMethod()->CancelComposition(textfield_);
+  }
 
   // NOTE: GetStateForTabSwitch may affect GetSelection, so order is important.
   AutocompleteEditModel::State model_state = model_->GetStateForTabSwitch();
   gfx::SelectionModel selection;
   textfield_->GetSelectionModel(&selection);
   GetStateAccessor()->SetProperty(
       tab->GetPropertyBag(),
       AutocompleteEditState(model_state, ViewState(selection)));
 }
 
@@ skipping 457 matching lines @@
   OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
                                                         toolbar_model,
                                                         profile,
                                                         command_updater,
                                                         popup_window_mode,
                                                         location_bar);
   omnibox_view->Init();
   return omnibox_view;
 }
 #endif