ash/common/system/tray/tray_item_more.h - Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray

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_more.h

Issue 2066583004: mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove

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_MORE_H_	5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_

6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_	6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_

7	7

8 #include "ash/system/tray/actionable_view.h"	8 #include "ash/common/system/tray/actionable_view.h"

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

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

11	11

12 namespace views {	12 namespace views {

13 class ImageView;	13 class ImageView;

14 class Label;	14 class Label;

15 class View;	15 class View;

16 }	16 }

17	17

18 namespace ash {	18 namespace ash {

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 views::ImageView* icon_;	51 views::ImageView* icon_;

52 views::Label* label_;	52 views::Label* label_;

53 views::ImageView* more_;	53 views::ImageView* more_;

54 base::string16 accessible_name_;	54 base::string16 accessible_name_;

55	55

56 DISALLOW_COPY_AND_ASSIGN(TrayItemMore);	56 DISALLOW_COPY_AND_ASSIGN(TrayItemMore);

57 };	57 };

58	58

59 } // namespace ash	59 } // namespace ash

60	60

61 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_	61 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_ITEM_MORE_H_

OLD	NEW

« no previous file with comments | « ash/common/system/tray/tray_empty.cc ('k') | ash/common/system/tray/tray_item_more.cc » ('j') | no next file with comments »