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

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

Issue 11316323: Cleanup enums for shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_background_view.h ('k') | ash/system/tray/tray_views.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 (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_item_view.h" 5 #include "ash/system/tray/tray_item_view.h"
6 6
7 #include "ash/shelf_types.h"
7 #include "ash/system/tray/system_tray.h" 8 #include "ash/system/tray/system_tray.h"
8 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
9 #include "ash/wm/shelf_types.h"
10 #include "ui/base/animation/slide_animation.h" 10 #include "ui/base/animation/slide_animation.h"
11 #include "ui/compositor/layer.h" 11 #include "ui/compositor/layer.h"
12 #include "ui/views/controls/image_view.h" 12 #include "ui/views/controls/image_view.h"
13 #include "ui/views/controls/label.h" 13 #include "ui/views/controls/label.h"
14 #include "ui/views/layout/box_layout.h" 14 #include "ui/views/layout/box_layout.h"
15 #include "ui/views/widget/widget.h" 15 #include "ui/views/widget/widget.h"
16 16
17 namespace { 17 namespace {
18 const int kTrayIconHeight = 29; 18 const int kTrayIconHeight = 29;
19 const int kTrayIconWidth = 29; 19 const int kTrayIconWidth = 29;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 if (animation->GetCurrentValue() < 0.1) 107 if (animation->GetCurrentValue() < 0.1)
108 views::View::SetVisible(false); 108 views::View::SetVisible(false);
109 } 109 }
110 110
111 void TrayItemView::AnimationCanceled(const ui::Animation* animation) { 111 void TrayItemView::AnimationCanceled(const ui::Animation* animation) {
112 AnimationEnded(animation); 112 AnimationEnded(animation);
113 } 113 }
114 114
115 } // namespace internal 115 } // namespace internal
116 } // namespace ash 116 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.h ('k') | ash/system/tray/tray_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698