Remove unused / unnecessary stuff from Instant.

chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class Browser;
 class OmniboxPopupView;
 class Profile;
 
 namespace gfx {
 class Font;
 }
 
-namespace ui {
-class MultiAnimation;
-}
-
 class GtkThemeService;
 
 class OmniboxViewGtk : public OmniboxView,
-                       public content::NotificationObserver,
-                       public ui::AnimationDelegate {
+                       public content::NotificationObserver {
  public:
   // Modeled like the Windows CHARRANGE.  Represent a pair of cursor position
   // offsets.  Since GtkTextIters are invalid after the buffer is changed, we
   // work in character offsets (not bytes).
   struct CharRange {
     CharRange() : cp_min(0), cp_max(0) { }
     CharRange(int n, int x) : cp_min(n), cp_max(x) { }
 
     // Returns the start/end of the selection.
     int selection_min() const { return std::min(cp_min, cp_max); }
@@ skipping 39 matching lines @@
   virtual void OnTemporaryTextMaybeChanged(
       const string16& display_text,
       bool save_original_selection) OVERRIDE;
   virtual bool OnInlineAutocompleteTextMaybeChanged(
       const string16& display_text, size_t user_text_length) OVERRIDE;
   virtual void OnRevertTemporaryText() OVERRIDE;
   virtual void OnBeforePossibleChange() OVERRIDE;
   virtual bool OnAfterPossibleChange() OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;
-  virtual void SetInstantSuggestion(const string16& suggestion,
-                                    bool animate_to_complete) OVERRIDE;
+  virtual void SetInstantSuggestion(const string16& suggestion) OVERRIDE;
   virtual string16 GetInstantSuggestion() const OVERRIDE;
   virtual int TextWidth() const OVERRIDE;
   virtual bool IsImeComposing() const OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // Overridden from ui::AnimationDelegate.
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
-
   // Sets the colors of the text view according to the theme.
   void SetBaseColor();
-  // Sets the colors of the instant suggestion view according to the theme and
-  // the animation state.
+  // Sets the colors of the instant suggestion view according to the theme.
   void UpdateInstantViewColors();
 
   // Returns the text view gtk widget. May return NULL if the widget
   // has already been destroyed.
   GtkWidget* text_view() {
     return text_view_;
   }
 
  private:
   CHROMEG_CALLBACK_0(OmniboxViewGtk, void, HandleBeginUserAction,
@@ skipping 162 matching lines @@
   void GetTextBufferBounds(GtkTextIter* start, GtkTextIter* end) const;
 
   // Validates an iterator in the |text_buffer_|, to make sure it doesn't go
   // beyond the anchor for holding the |instant_view_| widget.
   void ValidateTextBufferIter(GtkTextIter* iter) const;
 
   // Adjusts vertical alignment of the |instant_view_| in the |text_view_|, to
   // make sure they have the same baseline.
   void AdjustVerticalAlignmentOfInstantView();
 
-  // Stop showing the instant suggest auto-commit animation.
-  void StopAnimation();
-
   // The Browser that contains this omnibox.
   Browser* browser_;
 
   // The widget we expose, used for vertically centering the real text edit,
   // since the height will change based on the font / font size, etc.
   ui::OwnedWidgetGtk alignment_;
 
   // The actual text entry which will be owned by the alignment_.  The
   // reference will be set to NULL upon destruction to tell if the gtk
   // widget tree has been destroyed. This is because gtk destroies child
   // widgets if the parent (alignemtn_)'s refcount does not go down to 0.
   GtkWidget* text_view_;
 
   GtkTextTagTable* tag_table_;
   GtkTextBuffer* text_buffer_;
   GtkTextTag* faded_text_tag_;
   GtkTextTag* secure_scheme_tag_;
   GtkTextTag* security_error_scheme_tag_;
   GtkTextTag* normal_text_tag_;
 
   // Objects for the instant suggestion text view.
   GtkTextTag* instant_anchor_tag_;
 
   // A widget for displaying instant suggestion text. It'll be attached to a
   // child anchor in the |text_buffer_| object.
   GtkWidget* instant_view_;
-  // Animation from instant suggest (faded text) to autocomplete (selected
-  // text).
-  scoped_ptr<ui::MultiAnimation> instant_animation_;
 
   // A mark to split the content and the instant anchor. Wherever the end
   // iterator of the text buffer is required, the iterator to this mark should
   // be used.
   GtkTextMark* instant_mark_;
 
   scoped_ptr<OmniboxPopupView> popup_view_;
 
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (smaller font size). This is used for popups.
@@ skipping 117 matching lines @@
   // The view that is going to be focused next. Only valid while handling
   // "focus-out" events.
   GtkWidget* going_to_focus_;
 
   ui::GtkSignalRegistrar signals_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_