Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1036)

Side by Side Diff: athena/home/home_card_impl.cc

Issue 536013002: Decoupling visibility states from webcontent, adding visibility management in ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « athena/home/home_card_impl.h ('k') | athena/resource_manager/public/resource_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « athena/home/home_card_impl.h ('k') | athena/resource_manager/public/resource_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698