ash/system/chromeos/label_tray_view.cc - Issue 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc}

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 14949004: ash: Rename tray_views.{h,cc} to tray_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix browsertest Created 7 years, 7 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 | Annotate | Revision Log

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

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

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

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

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

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

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

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

15	14

16 namespace ash {	15 namespace ash {

17 namespace internal {	16 namespace internal {

18	17

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

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 child->text_label()->SetAllowCharacterBreak(true);	50 child->text_label()->SetAllowCharacterBreak(true);

52 child->set_border(views::Border::CreateEmptyBorder(0,	51 child->set_border(views::Border::CreateEmptyBorder(0,

53 kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));	52 kTrayPopupPaddingHorizontal, 0, kTrayPopupPaddingHorizontal));

54 child->SetExpandable(true);	53 child->SetExpandable(true);

55 child->SetVisible(true);	54 child->SetVisible(true);

56 return child;	55 return child;

57 }	56 }

58	57

59 } // namespace internal	58 } // namespace internal

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

OLD	NEW

« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | ash/system/tray/hover_highlight_view.cc » ('J')