Fix Instant suggest issues in Linux Views port.

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
 
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
 #include "gfx/skia_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/label.h"
 #include "views/drag_utils.h"
 
 #if defined(OS_WIN)
+#include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #include "chrome/browser/views/first_run_bubble.h"
 #endif
 
 using views::View;
 
 namespace {
 TabContents* GetTabContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContentsWrapper* wrapper = delegate->GetTabContentsWrapper();
   return wrapper ? wrapper->tab_contents() : NULL;
 }
@@ skipping 37 matching lines @@
     : profile_(profile),
       command_updater_(command_updater),
       model_(model),
       delegate_(delegate),
       disposition_(CURRENT_TAB),
       transition_(PageTransition::LINK),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
       location_entry_view_(NULL),
       selected_keyword_view_(NULL),
+#if defined(OS_WIN)
       suggested_text_view_(NULL),
+#endif
       keyword_hint_view_(NULL),
       star_view_(NULL),
       mode_(mode),
       show_focus_rect_(false),
       bubble_type_(FirstRun::MINIMAL_BUBBLE),
       template_url_model_(NULL),
       update_instant_(true) {
   DCHECK(profile_);
   SetID(VIEW_ID_LOCATION_BAR);
   SetFocusable(true);
@@ skipping 284 matching lines @@
   gfx::Point origin(location_entry_view_->bounds().origin());
   // If the UI layout is RTL, the coordinate system is not transformed and
   // therefore we need to adjust the X coordinate so that bubble appears on the
   // right hand side of the location bar.
   if (base::i18n::IsRTL())
     origin.set_x(width() - origin.x());
   views::View::ConvertPointToScreen(this, &origin);
   return origin;
 }
 
+#if defined(OS_WIN)
 void LocationBarView::OnCommitSuggestedText() {
   InstantController* instant = delegate_->GetInstant();
   DCHECK(instant);
   DCHECK(suggested_text_view_);
   OnCommitSuggestedText(location_entry_->GetText());
 }
+#endif
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0, GetThemeProvider()->GetBitmapNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
 
@@ skipping 179 matching lines @@
     // the added view.
     location_bounds.Inset(0, 0, kEditInternalSpace, 0);
     LayoutView(keyword_hint_view_, kItemEditPadding, available_width, false,
                &location_bounds);
     if (!keyword_hint_view_->IsVisible()) {
       // Put back the enlargement that we undid above.
       location_bounds.Inset(0, 0, -kEditInternalSpace, 0);
     }
   }
 
+#if defined(OS_WIN)
   // Layout out the suggested text view right aligned to the location
   // entry. Only show the suggested text if we can fit the text from one
   // character before the end of the selection to the end of the text and the
   // suggested text. If we can't it means either the suggested text is too big,
   // or the user has scrolled.
 
   // TODO(sky): We could potentially combine this with the previous step to
   // force using minimum size if necessary, but currently the chance of showing
   // keyword hints and suggested text is minimal and we're not confident this
   // is the right approach for suggested text.
   if (suggested_text_view_) {
     // TODO(sky): need to layout when the user changes caret position.
     int suggested_text_width = suggested_text_view_->GetPreferredSize().width();
     int vis_text_width = location_entry_->WidthOfTextAfterCursor();
     if (vis_text_width + suggested_text_width > entry_width) {
       // Hide the suggested text if the user has scrolled or we can't fit all
       // the suggested text.
       suggested_text_view_->SetBounds(0, 0, 0, 0);
     } else {
       int location_needed_width = location_entry_->TextWidth();
       location_bounds.set_width(std::min(location_needed_width,
                                          entry_width - suggested_text_width));
       // TODO(sky): figure out why this needs the -1.
       suggested_text_view_->SetBounds(location_bounds.right() - 1,
                                       location_bounds.y(),
                                       suggested_text_width,
                                       location_bounds.height());
     }
   }
+#endif
 
   location_entry_view_->SetBounds(location_bounds);
 }
 
 void LocationBarView::Paint(gfx::Canvas* canvas) {
   View::Paint(canvas);
 
   if (painter_.get()) {
     painter_->Paint(width(), height(), canvas);
   } else if (mode_ == POPUP) {
@@ skipping 113 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 || !HasValidSuggestText()) {
+  if (!instant)
     return false;
-  }
+
+#if defined(OS_WIN)
+  if(!HasValidSuggestText())
+    return false;
   location_entry_->model()->FinalizeInstantQuery(
       typed_text,
       suggested_text_view_->GetText());
   return true;
+#else
+  return location_entry_->CommitInstantSuggestion();
+#endif
 }
 
 void LocationBarView::OnSetSuggestedSearchText(const string16& suggested_text) {
   SetSuggestedText(suggested_text);
 }
 
 void LocationBarView::OnPopupBoundsChanged(const gfx::Rect& bounds) {
   InstantController* instant = delegate_->GetInstant();
   if (instant)
     instant->SetOmniboxBounds(bounds);
@@ skipping 66 matching lines @@
       instant->DestroyPreviewContents();
       location_entry_->model()->FinalizeInstantQuery(std::wstring(),
                                                      std::wstring());
     }
   }
 
   SetSuggestedText(suggested_text);
 }
 
 void LocationBarView::OnSelectionBoundsChanged() {
+#if defined(OS_WIN)
   if (suggested_text_view_)
     suggested_text_view_->StopAnimation();
+#else
+  NOTREACHED();
+#endif
 }
 
 void LocationBarView::OnInputInProgress(bool in_progress) {
   delegate_->OnInputInProgress(in_progress);
 }
 
 void LocationBarView::OnKillFocus() {
 }
 
 void LocationBarView::OnSetFocus() {
@@ skipping 156 matching lines @@
                        BubbleBorder::TOP_LEFT, bubble_type);
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   if (views::FocusManager::IsTabTraversalKeyEvent(e)) {
+#if defined(OS_WIN)
     if (HasValidSuggestText()) {
       // Return true so that the edit sees the tab and commits the suggestion.
       return true;
     }
+#endif
     InstantController* instant = delegate_->GetInstant();
     if (instant && instant->IsCurrent()) {
       // Tab while showing instant commits instant immediately.
       instant->CommitCurrentPreview(INSTANT_COMMIT_PRESSED_ENTER);
       // Return true so that focus traversal isn't attempted. The edit ends
       // up doing nothing in this case.
       return true;
     }
     if (keyword_hint_view_->IsVisible() && !e.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
@@ skipping 57 matching lines @@
     bubble_type_ = bubble_type;
     template_url_model_ = profile_->GetTemplateURLModel();
     template_url_model_->AddObserver(this);
     template_url_model_->Load();
     return;
   }
   ShowFirstRunBubbleInternal(bubble_type);
 }
 
 void LocationBarView::SetSuggestedText(const string16& input) {
+#if defined(OS_WIN)
   // Don't show the suggested text if inline autocomplete is prevented.
   string16 text = location_entry_->model()->UseVerbatimInstant() ?
       string16() : input;
   if (!text.empty()) {
     if (!suggested_text_view_) {
       suggested_text_view_ = new SuggestedTextView(this);
       suggested_text_view_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       suggested_text_view_->SetColor(
           GetColor(ToolbarModel::NONE,
                    LocationBarView::DEEMPHASIZED_TEXT));
       suggested_text_view_->SetText(UTF16ToWide(text));
       suggested_text_view_->SetFont(location_entry_->GetFont());
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->GetText() != UTF16ToWide(text)) {
       suggested_text_view_->SetText(UTF16ToWide(text));
     }
     suggested_text_view_->StartAnimation();
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
     return;
   }
 
   Layout();
   SchedulePaint();
+#else
+  location_entry_->SetInstantSuggestion(UTF16ToUTF8(input));
+#endif
 }
 
 std::wstring LocationBarView::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
@@ skipping 72 matching lines @@
 
   NOTREACHED();
 }
 
 void LocationBarView::OnTemplateURLModelChanged() {
   template_url_model_->RemoveObserver(this);
   template_url_model_ = NULL;
   ShowFirstRunBubble(bubble_type_);
 }
 
+#if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
+#endif