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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.h

Issue 302453002: New animation for the origin chip URL showing/hiding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bugfixes and more animations Created 6 years, 7 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/views/omnibox/omnibox_view_views.h
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index 4eb9d96083d70b19c15adb61cdab4ae1245cc8d7..26a47195da7676eca1a6ed1f66759afd38e050ea 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -12,7 +12,6 @@
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/toolbar/toolbar_model.h"
#include "ui/base/window_open_disposition.h"
-#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/range/range.h"
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_controller.h"
@@ -27,7 +26,6 @@ class Profile;
namespace gfx {
class RenderText;
-class SlideAnimation;
}
namespace ui {
@@ -38,7 +36,6 @@ class OSExchangeData;
class OmniboxViewViews
: public OmniboxView,
public views::Textfield,
- public gfx::AnimationDelegate,
#if defined(OS_CHROMEOS)
public
chromeos::input_method::InputMethodManager::CandidateWindowObserver,
@@ -56,12 +53,9 @@ class OmniboxViewViews
const gfx::FontList& font_list);
virtual ~OmniboxViewViews();
- // Initialize, create the underlying views, etc;
+ // Initialize, create the underlying views, etc.
void Init();
- // Starts an animation that fades in the entire OmniboxView.
- void FadeIn();
-
// Exposes the RenderText for tests.
#if defined(UNIT_TEST)
gfx::RenderText* GetRenderText() {
@@ -159,16 +153,11 @@ class OmniboxViewViews
virtual bool SkipDefaultKeyEventProcessing(
const ui::KeyEvent& event) OVERRIDE;
virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
virtual void OnFocus() OVERRIDE;
virtual void OnBlur() OVERRIDE;
virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
virtual base::string16 GetSelectionClipboardText() const OVERRIDE;
- // gfx::AnimationDelegate:
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
- virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
-
// chromeos::input_method::InputMethodManager::CandidateWindowObserver:
#if defined(OS_CHROMEOS)
virtual void CandidateWindowOpened(
@@ -233,8 +222,6 @@ class OmniboxViewViews
// and gets a tap. So we use this variable to remember focus state before tap.
bool select_all_on_gesture_tap_;
- scoped_ptr<gfx::SlideAnimation> fade_in_animation_;
-
DISALLOW_COPY_AND_ASSIGN(OmniboxViewViews);
};

Powered by Google App Engine
This is Rietveld 408576698