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/system/tray/tray_background_view.h" | 5 #include "ash/system/tray/tray_background_view.h" |
6 | 6 |
7 #include "ash/launcher/background_animator.h" | 7 #include "ash/launcher/background_animator.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
10 #include "ash/system/status_area_widget.h" | 10 #include "ash/system/status_area_widget.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 hover_background_animator_.SetPaintsBackground(false, | 139 hover_background_animator_.SetPaintsBackground(false, |
140 internal::BackgroundAnimator::CHANGE_IMMEDIATE); | 140 internal::BackgroundAnimator::CHANGE_IMMEDIATE); |
141 | 141 |
142 tray_container_ = new TrayContainer(shelf_alignment_); | 142 tray_container_ = new TrayContainer(shelf_alignment_); |
143 SetContents(tray_container_); | 143 SetContents(tray_container_); |
144 } | 144 } |
145 | 145 |
146 TrayBackgroundView::~TrayBackgroundView() { | 146 TrayBackgroundView::~TrayBackgroundView() { |
147 } | 147 } |
148 | 148 |
149 void TrayBackgroundView::OnMouseEntered(const views::MouseEvent& event) { | 149 void TrayBackgroundView::OnMouseEntered(const ui::MouseEvent& event) { |
150 hover_background_animator_.SetPaintsBackground(true, | 150 hover_background_animator_.SetPaintsBackground(true, |
151 internal::BackgroundAnimator::CHANGE_ANIMATE); | 151 internal::BackgroundAnimator::CHANGE_ANIMATE); |
152 } | 152 } |
153 | 153 |
154 void TrayBackgroundView::OnMouseExited(const views::MouseEvent& event) { | 154 void TrayBackgroundView::OnMouseExited(const ui::MouseEvent& event) { |
155 hover_background_animator_.SetPaintsBackground(false, | 155 hover_background_animator_.SetPaintsBackground(false, |
156 internal::BackgroundAnimator::CHANGE_ANIMATE); | 156 internal::BackgroundAnimator::CHANGE_ANIMATE); |
157 } | 157 } |
158 | 158 |
159 void TrayBackgroundView::ChildPreferredSizeChanged(views::View* child) { | 159 void TrayBackgroundView::ChildPreferredSizeChanged(views::View* child) { |
160 PreferredSizeChanged(); | 160 PreferredSizeChanged(); |
161 } | 161 } |
162 | 162 |
163 bool TrayBackgroundView::PerformAction(const ui::Event& event) { | 163 bool TrayBackgroundView::PerformAction(const ui::Event& event) { |
164 return false; | 164 return false; |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 } else { | 210 } else { |
211 set_border(views::Border::CreateEmptyBorder( | 211 set_border(views::Border::CreateEmptyBorder( |
212 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment, | 212 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment, |
213 on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0, | 213 on_edge ? kPaddingFromBottomOfScreenVerticalAlignment : 0, |
214 kPaddingFromOuterEdgeOfLauncherVerticalAlignment)); | 214 kPaddingFromOuterEdgeOfLauncherVerticalAlignment)); |
215 } | 215 } |
216 } | 216 } |
217 | 217 |
218 } // namespace internal | 218 } // namespace internal |
219 } // namespace ash | 219 } // namespace ash |
OLD | NEW |