OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/wm/panel_layout_manager.h" | 5 #include "ash/wm/panel_layout_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "ash/launcher/launcher.h" | 10 #include "ash/launcher/launcher.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 (*iter).x = std::max((*iter).min_x, std::min((*iter).max_x, x)); | 115 (*iter).x = std::max((*iter).min_x, std::min((*iter).max_x, x)); |
116 x += delta; | 116 x += delta; |
117 } | 117 } |
118 } | 118 } |
119 | 119 |
120 } // namespace | 120 } // namespace |
121 | 121 |
122 //////////////////////////////////////////////////////////////////////////////// | 122 //////////////////////////////////////////////////////////////////////////////// |
123 // PanelLayoutManager public implementation: | 123 // PanelLayoutManager public implementation: |
124 PanelLayoutManager::PanelLayoutManager(aura::Window* panel_container) | 124 PanelLayoutManager::PanelLayoutManager(aura::Window* panel_container) |
125 : panel_container_(panel_container), | 125 : ActivationChangeShim(Shell::GetInstance()), |
| 126 panel_container_(panel_container), |
126 in_layout_(false), | 127 in_layout_(false), |
127 dragged_panel_(NULL), | 128 dragged_panel_(NULL), |
128 launcher_(NULL), | 129 launcher_(NULL), |
129 last_active_panel_(NULL), | 130 last_active_panel_(NULL), |
130 callout_widget_(new views::Widget), | 131 callout_widget_(new views::Widget), |
131 weak_factory_(this) { | 132 weak_factory_(this) { |
132 DCHECK(panel_container); | 133 DCHECK(panel_container); |
133 views::Widget::InitParams params; | 134 views::Widget::InitParams params; |
134 params.type = views::Widget::InitParams::TYPE_POPUP; | 135 params.type = views::Widget::InitParams::TYPE_POPUP; |
135 params.transparent = true; | 136 params.transparent = true; |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 callout_bounds.set_x( | 464 callout_bounds.set_x( |
464 icon_bounds.x() + (icon_bounds.width() - callout_bounds.width()) / 2); | 465 icon_bounds.x() + (icon_bounds.width() - callout_bounds.width()) / 2); |
465 callout_bounds.set_y(bounds.bottom()); | 466 callout_bounds.set_y(bounds.bottom()); |
466 SetChildBoundsDirect(callout_widget_->GetNativeWindow(), callout_bounds); | 467 SetChildBoundsDirect(callout_widget_->GetNativeWindow(), callout_bounds); |
467 panel_container_->StackChildAtTop(callout_widget_->GetNativeWindow()); | 468 panel_container_->StackChildAtTop(callout_widget_->GetNativeWindow()); |
468 callout_widget_->Show(); | 469 callout_widget_->Show(); |
469 } | 470 } |
470 | 471 |
471 } // namespace internal | 472 } // namespace internal |
472 } // namespace ash | 473 } // namespace ash |
OLD | NEW |