| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "athena/home/home_card_impl.h" | 5 #include "athena/home/home_card_impl.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "athena/common/container_priorities.h" | 10 #include "athena/common/container_priorities.h" |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 | 411 |
| 412 void HomeCardImpl::OnOverviewModeEnter() { | 412 void HomeCardImpl::OnOverviewModeEnter() { |
| 413 if (state_ == VISIBLE_MINIMIZED) | 413 if (state_ == VISIBLE_MINIMIZED) |
| 414 SetState(VISIBLE_BOTTOM); | 414 SetState(VISIBLE_BOTTOM); |
| 415 } | 415 } |
| 416 | 416 |
| 417 void HomeCardImpl::OnOverviewModeExit() { | 417 void HomeCardImpl::OnOverviewModeExit() { |
| 418 SetState(VISIBLE_MINIMIZED); | 418 SetState(VISIBLE_MINIMIZED); |
| 419 } | 419 } |
| 420 | 420 |
| 421 void HomeCardImpl::OnActivityOrderHasChanged() { | 421 void HomeCardImpl::OnSplitViewModeEnter() { |
| 422 } |
| 423 |
| 424 void HomeCardImpl::OnSplitViewModeExit() { |
| 422 } | 425 } |
| 423 | 426 |
| 424 void HomeCardImpl::OnWindowActivated(aura::Window* gained_active, | 427 void HomeCardImpl::OnWindowActivated(aura::Window* gained_active, |
| 425 aura::Window* lost_active) { | 428 aura::Window* lost_active) { |
| 426 if (state_ != HIDDEN && | 429 if (state_ != HIDDEN && |
| 427 gained_active != home_card_widget_->GetNativeWindow()) { | 430 gained_active != home_card_widget_->GetNativeWindow()) { |
| 428 SetState(VISIBLE_MINIMIZED); | 431 SetState(VISIBLE_MINIMIZED); |
| 429 } | 432 } |
| 430 } | 433 } |
| 431 | 434 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 443 instance = NULL; | 446 instance = NULL; |
| 444 } | 447 } |
| 445 | 448 |
| 446 // static | 449 // static |
| 447 HomeCard* HomeCard::Get() { | 450 HomeCard* HomeCard::Get() { |
| 448 DCHECK(instance); | 451 DCHECK(instance); |
| 449 return instance; | 452 return instance; |
| 450 } | 453 } |
| 451 | 454 |
| 452 } // namespace athena | 455 } // namespace athena |
| OLD | NEW |