ash/common/system/tray/tray_item_view.h - 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.h

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 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_	5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_

6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_	6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

10 #include "ash/ash_export.h"	10 #include "ash/ash_export.h"

11 #include "base/macros.h"	11 #include "base/macros.h"

12 #include "ui/gfx/animation/animation_delegate.h"	12 #include "ui/gfx/animation/animation_delegate.h"

13 #include "ui/views/view.h"	13 #include "ui/views/view.h"

14	14

15 namespace gfx {	15 namespace gfx {

16 class SlideAnimation;	16 class SlideAnimation;

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 SystemTrayItem* owner_;	74 SystemTrayItem* owner_;

75 std::unique_ptr<gfx::SlideAnimation> animation_;	75 std::unique_ptr<gfx::SlideAnimation> animation_;

76 views::Label* label_;	76 views::Label* label_;

77 views::ImageView* image_view_;	77 views::ImageView* image_view_;

78	78

79 DISALLOW_COPY_AND_ASSIGN(TrayItemView);	79 DISALLOW_COPY_AND_ASSIGN(TrayItemView);

80 };	80 };

81	81

82 } // namespace ash	82 } // namespace ash

83	83

84 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_	84 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_

OLD	NEW

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