Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8048)

Unified Diff: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h

Issue 11262015: Remove unused / unnecessary stuff from Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove SuggestedTextView entirely Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
index 2cd3a6dad557a97c0fb832784b3ab5f49a649385..c813ea60cb9a546394dc9d9febfe235657367ff2 100644
--- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
+++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h
@@ -17,7 +17,6 @@
#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"
@@ -32,15 +31,10 @@ 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
@@ -100,8 +94,7 @@ class OmniboxViewGtk : public OmniboxView,
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;
@@ -111,15 +104,9 @@ class OmniboxViewGtk : public OmniboxView,
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
@@ -302,9 +289,6 @@ class OmniboxViewGtk : public OmniboxView,
// 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_;
@@ -331,9 +315,6 @@ class OmniboxViewGtk : public OmniboxView,
// 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
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm ('k') | chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698