ash/common/system/tray/tray_bar_button_with_title.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_bar_button_with_title.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_BAR_BUTTON_WITH_TITLE_H_	5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_

6 #define ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_	6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_

7	7

8 #include "base/compiler_specific.h"

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

10 #include "ui/views/controls/button/custom_button.h"	9 #include "ui/views/controls/button/custom_button.h"

11	10

12 namespace views {	11 namespace views {

13 class Label;	12 class Label;

14 }	13 }

15	14

16 namespace ash {	15 namespace ash {

17	16

18 // A button with a bar image and title text below the bar image. These buttons	17 // A button with a bar image and title text below the bar image. These buttons

(...skipping 18 matching lines...) Expand all Loading...
37 TrayBarButton* image_;	36 TrayBarButton* image_;

38 views::Label* title_;	37 views::Label* title_;

39 int width_;	38 int width_;

40 int image_height_;	39 int image_height_;

41	40

42 DISALLOW_COPY_AND_ASSIGN(TrayBarButtonWithTitle);	41 DISALLOW_COPY_AND_ASSIGN(TrayBarButtonWithTitle);

43 };	42 };

44	43

45 } // namespace ash	44 } // namespace ash

46	45

47 #endif // ASH_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_	46 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BAR_BUTTON_WITH_TITLE_H_

OLD	NEW

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