ash/system/chromeos/label_tray_view.cc - Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView 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/system/chromeos/label_tray_view.cc

Issue 2056683003: mash: Move tray_constants.h and FixedSizedImageView to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/chromeos/label_tray_view.h"	5 #include "ash/system/chromeos/label_tray_view.h"

6	6

	7 #include "ash/common/system/tray/tray_constants.h"

7 #include "ash/system/tray/hover_highlight_view.h"	8 #include "ash/system/tray/hover_highlight_view.h"

8 #include "ash/system/tray/tray_constants.h"

9 #include "ash/system/tray/view_click_listener.h"	9 #include "ash/system/tray/view_click_listener.h"

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

11 #include "ui/gfx/font.h"	11 #include "ui/gfx/font.h"

12 #include "ui/views/border.h"	12 #include "ui/views/border.h"

13 #include "ui/views/controls/label.h"	13 #include "ui/views/controls/label.h"

14 #include "ui/views/layout/fill_layout.h"	14 #include "ui/views/layout/fill_layout.h"

15	15

16 namespace ash {	16 namespace ash {

17	17

18 LabelTrayView::LabelTrayView(ViewClickListener* click_listener,	18 LabelTrayView::LabelTrayView(ViewClickListener* click_listener,

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 child->text_label()->SizeToFit(kTrayNotificationContentsWidth +	57 child->text_label()->SizeToFit(kTrayNotificationContentsWidth +

58 kNotificationIconWidth);	58 kNotificationIconWidth);

59 }	59 }

60 child->text_label()->SetAllowCharacterBreak(true);	60 child->text_label()->SetAllowCharacterBreak(true);

61 child->SetExpandable(true);	61 child->SetExpandable(true);

62 child->SetVisible(true);	62 child->SetVisible(true);

63 return child;	63 return child;

64 }	64 }

65	65

66 } // namespace ash	66 } // namespace ash

OLD	NEW