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

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

Issue 533403002: Fix touch selection for Athena home card (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check kContainerParamsKey property to find containers 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 if (!home_card_) { 113 if (!home_card_) {
114 home_card_ = child; 114 home_card_ = child;
115 Layout(false); 115 Layout(false);
116 } 116 }
117 } 117 }
118 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE { 118 virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
119 if (home_card_ == child) 119 if (home_card_ == child)
120 home_card_ = NULL; 120 home_card_ = NULL;
121 } 121 }
122 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE { 122 virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {
123 Layout(false);
124 } 123 }
125 virtual void OnChildWindowVisibilityChanged(aura::Window* child, 124 virtual void OnChildWindowVisibilityChanged(aura::Window* child,
126 bool visible) OVERRIDE { 125 bool visible) OVERRIDE {
127 Layout(false); 126 if (home_card_ == child)
127 Layout(false);
128 } 128 }
129 virtual void SetChildBounds(aura::Window* child, 129 virtual void SetChildBounds(aura::Window* child,
130 const gfx::Rect& requested_bounds) OVERRIDE { 130 const gfx::Rect& requested_bounds) OVERRIDE {
131 SetChildBoundsDirect(child, requested_bounds); 131 SetChildBoundsDirect(child, requested_bounds);
132 } 132 }
133 133
134 aura::Window* home_card_; 134 aura::Window* home_card_;
135 ui::Layer* minimized_layer_; 135 ui::Layer* minimized_layer_;
136 136
137 DISALLOW_COPY_AND_ASSIGN(HomeCardLayoutManager); 137 DISALLOW_COPY_AND_ASSIGN(HomeCardLayoutManager);
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 instance = NULL; 453 instance = NULL;
454 } 454 }
455 455
456 // static 456 // static
457 HomeCard* HomeCard::Get() { 457 HomeCard* HomeCard::Get() {
458 DCHECK(instance); 458 DCHECK(instance);
459 return instance; 459 return instance;
460 } 460 }
461 461
462 } // namespace athena 462 } // namespace athena
OLDNEW
« no previous file with comments | « no previous file | athena/screen/screen_manager_impl.cc » ('j') | athena/screen/screen_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698