Remove unused / unnecessary stuff from Instant.

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 22 matching lines @@
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/undoview/undo_view.h"
-#include "ui/base/animation/multi_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/menu_label_accelerator_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/skia_utils_gtk.h"
@@ skipping 343 matching lines @@
   instant_mark_ =
       gtk_text_buffer_create_mark(text_buffer_, NULL, &start_iter, FALSE);
 
   // Hooking up this handler after setting up above hacks for Instant view, so
   // that we won't filter out the special ZWP mark itself.
   g_signal_connect(text_buffer_, "insert-text",
                    G_CALLBACK(&HandleInsertTextThunk), this);
 
   AdjustVerticalAlignmentOfInstantView();
 
-  ui::MultiAnimation::Parts parts;
-  parts.push_back(ui::MultiAnimation::Part(
-      InstantController::kInlineAutocompletePauseTimeMS, ui::Tween::ZERO));
-  parts.push_back(ui::MultiAnimation::Part(
-      InstantController::kInlineAutocompleteFadeInTimeMS, ui::Tween::EASE_IN));
-  instant_animation_.reset(new ui::MultiAnimation(parts));
-  instant_animation_->set_continuous(false);
-
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
 
   ViewIDUtil::SetID(GetNativeView(), VIEW_ID_AUTOCOMPLETE);
 }
 
 void OmniboxViewGtk::HandleHierarchyChanged(GtkWidget* sender,
                                             GtkWidget* old_toplevel) {
@@ skipping 280 matching lines @@
 gfx::NativeView OmniboxViewGtk::GetNativeView() const {
   return alignment_.get();
 }
 
 gfx::NativeView OmniboxViewGtk::GetRelativeWindowForPopup() const {
   GtkWidget* toplevel = gtk_widget_get_toplevel(GetNativeView());
   DCHECK(gtk_widget_is_toplevel(toplevel));
   return toplevel;
 }
 
-void OmniboxViewGtk::SetInstantSuggestion(const string16& suggestion,
-                                          bool animate_to_complete) {
+void OmniboxViewGtk::SetInstantSuggestion(const string16& suggestion) {
   std::string suggestion_utf8 = UTF16ToUTF8(suggestion);
 
   gtk_label_set_text(GTK_LABEL(instant_view_), suggestion_utf8.c_str());
 
-  StopAnimation();
-
   if (suggestion.empty()) {
     gtk_widget_hide(instant_view_);
     return;
   }
-  bool animate = animate_to_complete;
-  if (supports_pre_edit_)
-    animate = animate && pre_edit_.empty();
-  if (animate) {
-    instant_animation_->set_delegate(this);
-    instant_animation_->Start();
-  }
 
   gtk_widget_show(instant_view_);
   AdjustVerticalAlignmentOfInstantView();
   UpdateInstantViewColors();
 }
 
 string16 OmniboxViewGtk::GetInstantSuggestion() const {
   const gchar* suggestion = gtk_label_get_text(GTK_LABEL(instant_view_));
   return suggestion ? UTF8ToUTF16(suggestion) : string16();
 }
@@ skipping 48 matching lines @@
 }
 
 void OmniboxViewGtk::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
 
   SetBaseColor();
 }
 
-void OmniboxViewGtk::AnimationEnded(const ui::Animation* animation) {
-  model()->CommitSuggestedText(false);
-}
-
-void OmniboxViewGtk::AnimationProgressed(const ui::Animation* animation) {
-  UpdateInstantViewColors();
-}
-
-void OmniboxViewGtk::AnimationCanceled(const ui::Animation* animation) {
-  UpdateInstantViewColors();
-}
-
 void OmniboxViewGtk::SetBaseColor() {
   DCHECK(text_view_);
 
   bool use_gtk = theme_service_->UsingNativeTheme();
   if (use_gtk) {
     gtk_widget_modify_cursor(text_view_, NULL, NULL);
     gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_base(text_view_, GTK_STATE_SELECTED, NULL);
     gtk_widget_modify_text(text_view_, GTK_STATE_SELECTED, NULL);
     gtk_widget_modify_base(text_view_, GTK_STATE_ACTIVE, NULL);
@@ skipping 44 matching lines @@
 
     g_object_set(faded_text_tag_, "foreground", kTextBaseColor, NULL);
     g_object_set(normal_text_tag_, "foreground", "#000000", NULL);
   }
 
   AdjustVerticalAlignmentOfInstantView();
   UpdateInstantViewColors();
 }
 
 void OmniboxViewGtk::UpdateInstantViewColors() {
-  SkColor selection_text, selection_bg;
-  GdkColor faded_text, normal_bg;
-
-  bool use_gtk = theme_service_->UsingNativeTheme();
-  if (use_gtk) {
+  GdkColor faded_text;
+  if (theme_service_->UsingNativeTheme()) {
     GtkStyle* style = gtk_rc_get_style(instant_view_);
-
     faded_text = gtk_util::AverageColors(
         style->text[GTK_STATE_NORMAL], style->base[GTK_STATE_NORMAL]);
-    normal_bg = style->base[GTK_STATE_NORMAL];
-
-    selection_text = gfx::GdkColorToSkColor(style->text[GTK_STATE_SELECTED]);
-    selection_bg = gfx::GdkColorToSkColor(style->base[GTK_STATE_SELECTED]);
   } else {
     gdk_color_parse(kTextBaseColor, &faded_text);
-
-    normal_bg = LocationBarViewGtk::kBackgroundColor;
-    selection_text =
-        theme_service_->get_active_selection_fg_color();
-    selection_bg =
-        theme_service_->get_active_selection_bg_color();
   }
-
-  double alpha = instant_animation_->is_animating() ?
-      instant_animation_->GetCurrentValue() : 0.0;
-  GdkColor text = gfx::SkColorToGdkColor(color_utils::AlphaBlend(
-      selection_text,
-      gfx::GdkColorToSkColor(faded_text),
-      alpha * 0xff));
-  GdkColor bg = gfx::SkColorToGdkColor(color_utils::AlphaBlend(
-      selection_bg,
-      gfx::GdkColorToSkColor(normal_bg),
-      alpha * 0xff));
-
-  if (alpha > 0.0) {
-    gtk_label_select_region(GTK_LABEL(instant_view_), 0, -1);
-    // ACTIVE is the state for text that is selected, but not focused.
-    gtk_widget_modify_text(instant_view_, GTK_STATE_ACTIVE, &text);
-    gtk_widget_modify_base(instant_view_, GTK_STATE_ACTIVE, &bg);
-  } else {
-    // When the text is unselected, fg is used for text color, the state
-    // is NORMAL, and the background is transparent.
-    gtk_widget_modify_fg(instant_view_, GTK_STATE_NORMAL, &text);
-  }
+  gtk_widget_modify_fg(instant_view_, GTK_STATE_NORMAL, &faded_text);
 }
 
 void OmniboxViewGtk::HandleBeginUserAction(GtkTextBuffer* sender) {
   OnBeforePossibleChange();
 }
 
 void OmniboxViewGtk::HandleEndUserAction(GtkTextBuffer* sender) {
   OnAfterPossibleChange();
 }
 
@@ skipping 415 matching lines @@
                                    GtkTextIter* location,
                                    GtkTextMark* mark) {
   if (!text_buffer_ || buffer != text_buffer_)
     return;
 
   if (mark != gtk_text_buffer_get_insert(text_buffer_) &&
       mark != gtk_text_buffer_get_selection_bound(text_buffer_)) {
     return;
   }
 
-  StopAnimation();
-
   // If we are here, that means the user may be changing the selection
   selection_suggested_ = false;
 
   // Get the currently-selected text, if there is any.
   std::string new_selected_text = GetSelectedText();
 
   // If we had some text selected earlier but it's no longer highlighted, we
   // might need to save it now...
   if (!selected_text_.empty() && new_selected_text.empty()) {
     // ... but only if we currently own the selection.  We want to manually
@@ skipping 567 matching lines @@
   gtk_text_buffer_get_iter_at_offset(text_buffer_, iter_min, range.cp_min);
   gtk_text_buffer_get_iter_at_offset(text_buffer_, iter_max, range.cp_max);
 }
 
 bool OmniboxViewGtk::IsCaretAtEnd() const {
   const CharRange selection = GetSelection();
   return selection.cp_min == selection.cp_max &&
       selection.cp_min == GetOmniboxTextLength();
 }
 
-void OmniboxViewGtk::StopAnimation() {
-  // Clear the animation delegate so we don't get an AnimationEnded() callback.
-  instant_animation_->set_delegate(NULL);
-  instant_animation_->Stop();
-  UpdateInstantViewColors();
-}
-
 void OmniboxViewGtk::SavePrimarySelection(const std::string& selected_text) {
   DCHECK(text_view_);
 
   GtkClipboard* clipboard =
       gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
   DCHECK(clipboard);
   if (!clipboard)
     return;
 
   gtk_clipboard_set_text(
@@ skipping 243 matching lines @@
 void OmniboxViewGtk::AdjustVerticalAlignmentOfInstantView() {
   // By default, GtkTextView layouts an anchored child widget just above the
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   int baseline = pango_layout_get_baseline(layout);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }