| Index: athena/home/home_card_impl.cc
|
| diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
|
| index 2b11db46220dc0e0f33b46f7b0f6d66810ef2376..3b285fb858adbdf527d43b4fe3fcc2f011a7e1b8 100644
|
| --- a/athena/home/home_card_impl.cc
|
| +++ b/athena/home/home_card_impl.cc
|
| @@ -197,7 +197,7 @@ class HomeCardView : public views::WidgetDelegateView {
|
| virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
|
| if (HomeCard::Get()->GetState() == HomeCard::VISIBLE_MINIMIZED &&
|
| event.IsLeftMouseButton() && event.GetClickCount() == 1) {
|
| - athena::WindowManager::GetInstance()->ToggleOverview();
|
| + athena::WindowManager::Get()->ToggleOverview();
|
| return true;
|
| }
|
| return false;
|
| @@ -232,12 +232,12 @@ HomeCardImpl::HomeCardImpl(AppModelBuilder* model_builder)
|
| activation_client_(NULL) {
|
| DCHECK(!instance);
|
| instance = this;
|
| - WindowManager::GetInstance()->AddObserver(this);
|
| + WindowManager::Get()->AddObserver(this);
|
| }
|
|
|
| HomeCardImpl::~HomeCardImpl() {
|
| DCHECK(instance);
|
| - WindowManager::GetInstance()->RemoveObserver(this);
|
| + WindowManager::Get()->RemoveObserver(this);
|
| if (activation_client_)
|
| activation_client_->RemoveObserver(this);
|
| home_card_widget_->CloseNow();
|
| @@ -379,7 +379,7 @@ void HomeCardImpl::OnGestureEnded(State final_state, bool is_fling) {
|
| if (state_ != final_state &&
|
| (state_ == VISIBLE_MINIMIZED || final_state == VISIBLE_MINIMIZED)) {
|
| SetState(final_state);
|
| - WindowManager::GetInstance()->ToggleOverview();
|
| + WindowManager::Get()->ToggleOverview();
|
| } else {
|
| state_ = final_state;
|
| // When the animation happens after a fling, EASE_IN_OUT would cause weird
|
|
|