diff options
Diffstat (limited to 'chrome/browser/ui/views/download_shelf_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/download_shelf_view.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index 5db8ba1..c3a4ea3 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -8,8 +8,8 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/slide_animation.h" #include "base/logging.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -22,6 +22,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/animation/slide_animation.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" @@ -102,8 +103,8 @@ void DownloadShelfView::Init() { arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON)); AddChildView(arrow_image_); - show_all_view_ = - new views::Link(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS)); + show_all_view_ = new views::Link( + UTF16ToWide(l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS))); show_all_view_->SetController(this); AddChildView(show_all_view_); @@ -114,14 +115,15 @@ void DownloadShelfView::Init() { rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); close_button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); - close_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_CLOSE)); + close_button_->SetAccessibleName( + UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE))); UpdateButtonColors(); AddChildView(close_button_); - new_item_animation_.reset(new SlideAnimation(this)); + new_item_animation_.reset(new ui::SlideAnimation(this)); new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs); - shelf_animation_.reset(new SlideAnimation(this)); + shelf_animation_.reset(new ui::SlideAnimation(this)); shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs); Show(); } @@ -222,7 +224,7 @@ gfx::Size DownloadShelfView::GetPreferredSize() { return prefsize; } -void DownloadShelfView::AnimationProgressed(const Animation *animation) { +void DownloadShelfView::AnimationProgressed(const ui::Animation *animation) { if (animation == new_item_animation_.get()) { Layout(); SchedulePaint(); @@ -237,7 +239,7 @@ void DownloadShelfView::AnimationProgressed(const Animation *animation) { } } -void DownloadShelfView::AnimationEnded(const Animation *animation) { +void DownloadShelfView::AnimationEnded(const ui::Animation *animation) { if (animation == shelf_animation_.get()) { parent_->SetDownloadShelfVisible(shelf_animation_->IsShowing()); if (!shelf_animation_->IsShowing()) |