ash/common/system/tray/tray_item_view.cc - Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2063813002: mash: Move SystemTrayImage and TrayImageItem to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wmnotifier

Patch Set: rebase Created 4 years, 6 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

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_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/shelf/shelf_util.h"	9 #include "ash/common/system/tray/system_tray_item.h"

10 #include "ash/system/tray/system_tray.h"	10 #include "ash/system/tray/system_tray.h"

11 #include "ash/system/tray/system_tray_item.h"

12 #include "ui/compositor/layer.h"	11 #include "ui/compositor/layer.h"

13 #include "ui/gfx/animation/slide_animation.h"	12 #include "ui/gfx/animation/slide_animation.h"

14 #include "ui/views/controls/image_view.h"	13 #include "ui/views/controls/image_view.h"

15 #include "ui/views/controls/label.h"	14 #include "ui/views/controls/label.h"

16 #include "ui/views/layout/box_layout.h"	15 #include "ui/views/layout/box_layout.h"

17 #include "ui/views/widget/widget.h"	16 #include "ui/views/widget/widget.h"

18	17

19 namespace {	18 namespace {

20 const int kTrayIconHeight = 29;	19 const int kTrayIconHeight = 29;

21 const int kTrayIconWidth = 29;	20 const int kTrayIconWidth = 29;

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129 void TrayItemView::AnimationEnded(const gfx::Animation* animation) {	128 void TrayItemView::AnimationEnded(const gfx::Animation* animation) {

130 if (animation->GetCurrentValue() < 0.1)	129 if (animation->GetCurrentValue() < 0.1)

131 views::View::SetVisible(false);	130 views::View::SetVisible(false);

132 }	131 }

133	132

134 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {	133 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {

135 AnimationEnded(animation);	134 AnimationEnded(animation);

136 }	135 }

137	136

138 } // namespace ash	137 } // namespace ash

OLD	NEW

« ash/common/system/tray/DEPS ('K') | « ash/common/system/tray/tray_item_view.h ('k') | ash/common/system/tray/tray_utils.h » ('j') | no next file with comments »