Remove unused / unnecessary stuff from Instant.

chrome/browser/ui/views/location_bar/location_bar_view.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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 29 matching lines @@
 #include "chrome/browser/ui/views/location_bar/action_box_button_view.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/open_pdf_in_reader_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 "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #include "chrome/browser/ui/views/location_bar/web_intents_button_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/zoom_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_views.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
@@ skipping 548 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;
 }
 
-void LocationBarView::SetInstantSuggestion(const string16& text,
-                                           bool animate_to_complete) {
+void LocationBarView::SetInstantSuggestion(const string16& text) {
   // Don't show the suggested text if inline autocomplete is prevented.
   if (!text.empty()) {
     if (!suggested_text_view_) {
-      suggested_text_view_ = new SuggestedTextView(
-          location_entry_->model(), instant_extended_api_enabled_);
+      suggested_text_view_ = new views::Label();
+      suggested_text_view_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+      suggested_text_view_->SetAutoColorReadabilityEnabled(false);
+      suggested_text_view_->SetEnabledColor(LocationBarView::GetColor(
+          instant_extended_api_enabled_, ToolbarModel::NONE,
+          LocationBarView::DEEMPHASIZED_TEXT));
       suggested_text_view_->SetText(text);
       suggested_text_view_->SetFont(location_entry_->GetFont());
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->text() != text) {
       suggested_text_view_->SetText(text);
     }
-    if (animate_to_complete && !location_entry_->IsImeComposing())
-      suggested_text_view_->StartAnimation();
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
     return;
   }
 
   Layout();
   SchedulePaint();
 }
@@ skipping 504 matching lines @@
   location_icon_view_->SetImage(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           location_entry_->GetIcon()));
   location_icon_view_->ShowTooltip(!GetLocationEntry()->IsEditingOrEmpty());
 
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::OnSelectionBoundsChanged() {
-  if (suggested_text_view_)
-    suggested_text_view_->StopAnimation();
 }
 
 void LocationBarView::OnInputInProgress(bool in_progress) {
   delegate_->OnInputInProgress(in_progress);
 }
 
 void LocationBarView::OnKillFocus() {
 }
 
 void LocationBarView::OnSetFocus() {
@@ skipping 511 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA