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

Side by Side Diff: ash/common/system/tray/tray_item_view.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay
Patch Set: rebase Created 4 years, 5 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 | « ash/common/system/tray/tray_image_item.cc ('k') | ash/common/system/tray_accessibility.cc » ('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 (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/common/system/tray/tray_item_view.h" 5 #include "ash/common/system/tray/tray_item_view.h"
6 6
7 #include "ash/common/shelf/shelf_types.h" 7 #include "ash/common/shelf/shelf_types.h"
8 #include "ash/common/shelf/wm_shelf_util.h" 8 #include "ash/common/shelf/wm_shelf_util.h"
9 #include "ash/common/system/tray/system_tray.h"
9 #include "ash/common/system/tray/system_tray_item.h" 10 #include "ash/common/system/tray/system_tray_item.h"
10 #include "ash/system/tray/system_tray.h"
11 #include "ui/compositor/layer.h" 11 #include "ui/compositor/layer.h"
12 #include "ui/gfx/animation/slide_animation.h" 12 #include "ui/gfx/animation/slide_animation.h"
13 #include "ui/views/controls/image_view.h" 13 #include "ui/views/controls/image_view.h"
14 #include "ui/views/controls/label.h" 14 #include "ui/views/controls/label.h"
15 #include "ui/views/layout/box_layout.h" 15 #include "ui/views/layout/box_layout.h"
16 #include "ui/views/widget/widget.h" 16 #include "ui/views/widget/widget.h"
17 17
18 namespace { 18 namespace {
19 const int kTrayIconHeight = 29; 19 const int kTrayIconHeight = 29;
20 const int kTrayIconWidth = 29; 20 const int kTrayIconWidth = 29;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void TrayItemView::AnimationEnded(const gfx::Animation* animation) { 126 void TrayItemView::AnimationEnded(const gfx::Animation* animation) {
127 if (animation->GetCurrentValue() < 0.1) 127 if (animation->GetCurrentValue() < 0.1)
128 views::View::SetVisible(false); 128 views::View::SetVisible(false);
129 } 129 }
130 130
131 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) { 131 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {
132 AnimationEnded(animation); 132 AnimationEnded(animation);
133 } 133 }
134 134
135 } // namespace ash 135 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | ash/common/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698