Refactor AutocompleteEditViewGtk so that AutocompleteEditView impl can be swapped.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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/views/location_bar/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 144 matching lines @@
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->SetDragController(this);
 
   // URL edit field.
   // View container for URL edit field.
 #if defined(OS_WIN)
   location_entry_.reset(new AutocompleteEditViewWin(font_, this, model_, this,
       GetWidget()->GetNativeView(), profile_, command_updater_,
       mode_ == POPUP, this));
 #else
-  location_entry_.reset(new AutocompleteEditViewGtk(this, model_, profile_,
-      command_updater_, mode_ == POPUP, this));
-  location_entry_->Init();
-  // Make all the children of the widget visible. NOTE: this won't display
-  // anything, it just toggles the visible flag.
-  gtk_widget_show_all(location_entry_->GetNativeView());
-  // Hide the widget. NativeViewHostGtk will make it visible again as
-  // necessary.
-  gtk_widget_hide(location_entry_->GetNativeView());
+  location_entry_.reset(
+      AutocompleteEditViewGtk::Create(
+          this, model_, profile_,
+          command_updater_, mode_ == POPUP, this));
+#endif
 
-  // Associate an accessible name with the location entry.
-  accessible_widget_helper_.reset(new AccessibleWidgetHelper(
-      location_entry_->text_view(), profile_));
-  accessible_widget_helper_->SetWidgetName(
-      location_entry_->text_view(),
-      l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION));
-#endif
-  location_entry_view_ = new views::NativeViewHost;
+  location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
-  AddChildView(location_entry_view_);
-  location_entry_view_->set_focus_view(this);
-  location_entry_view_->Attach(location_entry_->GetNativeView());
   location_entry_view_->SetAccessibleName(
       l10n_util::GetString(IDS_ACCNAME_LOCATION));
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
       GetColor(ToolbarModel::NONE, TEXT), profile_),
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
   selected_keyword_view_->SetVisible(false);
 
@@ skipping 578 matching lines @@
   if (instant)
     instant->OnAutocompleteLostFocus(view_gaining_focus);
 }
 
 void LocationBarView::OnAutocompleteWillAccept() {
   update_instant_ = false;
 }
 
 bool LocationBarView::OnCommitSuggestedText(const std::wstring& typed_text) {
   InstantController* instant = delegate_->GetInstant();
-  if (!instant)
+  if (!instant || !HasValidSuggestText())
     return false;
-
 #if defined(OS_WIN)

[Peter Kasting, 2011/01/06 02:06:48]

Nit: While I like const locals, most Chrome code avoids them.  You could save a
line, then, by rewriting:

std::wstring suggestion;
#if defined(OS_WIN)
suggestion = suggested_text_view_->GetText();
#endif

[oshima, 2011/01/06 19:43:35]

Done.

-  if (!HasValidSuggestText())
-    return false;
-  location_entry_->model()->FinalizeInstantQuery(
-      typed_text,
-      suggested_text_view_->GetText());
-  return true;
+  const std::wstring suggestion = suggested_text_view_->GetText();
 #else
-  return location_entry_->CommitInstantSuggestion();
+  const std::wstring suggestion;
 #endif
+  return location_entry_->CommitInstantSuggestion(typed_text, suggestion);
 }
 
 bool LocationBarView::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(delegate_->GetInstant());
 }
 
 void LocationBarView::OnSetSuggestedSearchText(const string16& suggested_text) {
   SetSuggestedText(suggested_text);
 }
 
@@ skipping 354 matching lines @@
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
     return;
   }
 
   Layout();
   SchedulePaint();
 #else
-  location_entry_->SetInstantSuggestion(UTF16ToUTF8(input));
+  location_entry_->SetInstantSuggestion(input);
 #endif
 }
 
 std::wstring LocationBarView::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
   return disposition_;
 }
@@ skipping 73 matching lines @@
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLModelChanged() {
   template_url_model_->RemoveObserver(this);
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }
 
+bool LocationBarView::HasValidSuggestText() {
 #if defined(OS_WIN)
-bool LocationBarView::HasValidSuggestText() {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
+#else
+  return true;

[Peter Kasting, 2011/01/06 02:06:48]

Nit: Wouldn't it be better to call the AutocompleteEditViewGtk and ask it to do
the check that currently begins CommitInstantSuggestion()?

[oshima, 2011/01/06 19:43:35]

Thank you for suggestion. Yes, i'm planning to refactor this piece further (I
want to move HasValidSuggestText to AutocompleteEditView) to something similar
to your suggestion, but not in this CL. This was just one step towards it, but
it is probably immasure and shouldn't be in this CL. I reverted this change.

+#endif
 }
-#endif