ash/system/tray/label_tray_view.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/tray/label_tray_view.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « ash/system/tray/hover_highlight_view.cc ('k') | ash/system/tray/special_popup_row.h » ('j') | no next file with comments »

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/label_tray_view.h"	5 #include "ash/system/tray/label_tray_view.h"

6	6

7 #include "ash/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

8 #include "ash/resources/grit/ash_resources.h"	8 #include "ash/resources/grit/ash_resources.h"

9 #include "ash/resources/vector_icons/vector_icons.h"	9 #include "ash/resources/vector_icons/vector_icons.h"

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

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

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

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

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

15 #include "ui/gfx/paint_vector_icon.h"	15 #include "ui/gfx/paint_vector_icon.h"

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

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

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

91 kNotificationIconWidth);	91 kNotificationIconWidth);

92 }	92 }

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

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

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

96 return child;	96 return child;

97 }	97 }

98	98

99 } // namespace ash	99 } // namespace ash

OLD	NEW