Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc |
index 4b64cb7a431102e450d68fe0506fb51e5e237446..da434f9ec1168ffc23f24cf1d575f4de3dc737cd 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc |
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc |
@@ -43,7 +43,6 @@ |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/compositor/layer.h" |
#include "ui/events/event.h" |
-#include "ui/gfx/animation/slide_animation.h" |
#include "ui/gfx/canvas.h" |
#include "ui/gfx/font_list.h" |
#include "ui/gfx/selection_model.h" |
@@ -177,14 +176,6 @@ void OmniboxViewViews::Init() { |
chromeos::input_method::InputMethodManager::Get()-> |
AddCandidateWindowObserver(this); |
#endif |
- |
- fade_in_animation_.reset(new gfx::SlideAnimation(this)); |
- fade_in_animation_->SetTweenType(gfx::Tween::LINEAR); |
- fade_in_animation_->SetSlideDuration(300); |
-} |
- |
-void OmniboxViewViews::FadeIn() { |
- fade_in_animation_->Show(); |
} |
void OmniboxViewViews::SaveStateToTab(content::WebContents* tab) { |
@@ -797,17 +788,6 @@ void OmniboxViewViews::GetAccessibleState(ui::AXViewState* state) { |
state->role = ui::AX_ROLE_TEXT_FIELD; |
} |
-void OmniboxViewViews::OnPaint(gfx::Canvas* canvas) { |
- if (fade_in_animation_->is_animating()) { |
- canvas->SaveLayerAlpha(static_cast<uint8>( |
- fade_in_animation_->CurrentValueBetween(0, 255))); |
- views::Textfield::OnPaint(canvas); |
- canvas->Restore(); |
- } else { |
- views::Textfield::OnPaint(canvas); |
- } |
-} |
- |
void OmniboxViewViews::OnFocus() { |
views::Textfield::OnFocus(); |
// TODO(oshima): Get control key state. |
@@ -866,14 +846,6 @@ base::string16 OmniboxViewViews::GetSelectionClipboardText() const { |
return SanitizeTextForPaste(Textfield::GetSelectionClipboardText()); |
} |
-void OmniboxViewViews::AnimationProgressed(const gfx::Animation* animation) { |
- SchedulePaint(); |
-} |
- |
-void OmniboxViewViews::AnimationEnded(const gfx::Animation* animation) { |
- fade_in_animation_->Reset(); |
-} |
- |
#if defined(OS_CHROMEOS) |
void OmniboxViewViews::CandidateWindowOpened( |
chromeos::input_method::InputMethodManager* manager) { |