| Index: ash/system/tray/throbber_view.cc
|
| diff --git a/ash/system/tray/throbber_view.cc b/ash/system/tray/throbber_view.cc
|
| deleted file mode 100644
|
| index b6c02d81ab6b9540002df0618eea7cd9846f5488..0000000000000000000000000000000000000000
|
| --- a/ash/system/tray/throbber_view.cc
|
| +++ /dev/null
|
| @@ -1,97 +0,0 @@
|
| -// Copyright (c) 2013 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.
|
| -
|
| -#include "ash/system/tray/throbber_view.h"
|
| -
|
| -#include "ash/resources/grit/ash_resources.h"
|
| -#include "ash/system/tray/tray_constants.h"
|
| -#include "ui/base/resource/resource_bundle.h"
|
| -#include "ui/compositor/layer.h"
|
| -#include "ui/compositor/scoped_layer_animation_settings.h"
|
| -
|
| -namespace ash {
|
| -namespace {
|
| -
|
| -// Duration for showing/hiding animation in milliseconds.
|
| -const int kThrobberAnimationDurationMs = 200;
|
| -
|
| -} // namespace
|
| -
|
| -SystemTrayThrobber::SystemTrayThrobber() : views::SmoothedThrobber() {}
|
| -
|
| -SystemTrayThrobber::~SystemTrayThrobber() {}
|
| -
|
| -void SystemTrayThrobber::SetTooltipText(const base::string16& tooltip_text) {
|
| - tooltip_text_ = tooltip_text;
|
| -}
|
| -
|
| -bool SystemTrayThrobber::GetTooltipText(const gfx::Point& p,
|
| - base::string16* tooltip) const {
|
| - if (tooltip_text_.empty())
|
| - return false;
|
| -
|
| - *tooltip = tooltip_text_;
|
| - return true;
|
| -}
|
| -
|
| -ThrobberView::ThrobberView() {
|
| - throbber_ = new SystemTrayThrobber();
|
| - throbber_->set_stop_delay_ms(kThrobberAnimationDurationMs);
|
| - AddChildView(throbber_);
|
| -
|
| - SetPaintToLayer();
|
| - layer()->SetFillsBoundsOpaquely(false);
|
| - layer()->SetOpacity(0.0);
|
| -}
|
| -
|
| -ThrobberView::~ThrobberView() {}
|
| -
|
| -gfx::Size ThrobberView::GetPreferredSize() const {
|
| - return gfx::Size(kTrayPopupItemMinHeight, kTrayPopupItemMinHeight);
|
| -}
|
| -
|
| -void ThrobberView::Layout() {
|
| - View* child = child_at(0);
|
| - gfx::Size ps = child->GetPreferredSize();
|
| - child->SetBounds((width() - ps.width()) / 2, (height() - ps.height()) / 2,
|
| - ps.width(), ps.height());
|
| - SizeToPreferredSize();
|
| -}
|
| -
|
| -bool ThrobberView::GetTooltipText(const gfx::Point& p,
|
| - base::string16* tooltip) const {
|
| - if (tooltip_text_.empty())
|
| - return false;
|
| -
|
| - *tooltip = tooltip_text_;
|
| - return true;
|
| -}
|
| -
|
| -void ThrobberView::Start() {
|
| - ScheduleAnimation(true);
|
| - throbber_->Start();
|
| -}
|
| -
|
| -void ThrobberView::Stop() {
|
| - ScheduleAnimation(false);
|
| - throbber_->Stop();
|
| -}
|
| -
|
| -void ThrobberView::SetTooltipText(const base::string16& tooltip_text) {
|
| - tooltip_text_ = tooltip_text;
|
| - throbber_->SetTooltipText(tooltip_text);
|
| -}
|
| -
|
| -void ThrobberView::ScheduleAnimation(bool start_throbber) {
|
| - // Stop any previous animation.
|
| - layer()->GetAnimator()->StopAnimating();
|
| -
|
| - ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());
|
| - animation.SetTransitionDuration(
|
| - base::TimeDelta::FromMilliseconds(kThrobberAnimationDurationMs));
|
| -
|
| - layer()->SetOpacity(start_throbber ? 1.0 : 0.0);
|
| -}
|
| -
|
| -} // namespace ash
|
|
|