ash/system/tray/tray_utils.cc - Issue 145033006: views: Make View::set_border() take a scoped_ptr<>.

Side by Side Diff: ash/system/tray/tray_utils.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Further renaming Created 6 years, 11 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/tray/tray_utils.h"	5 #include "ash/system/tray/tray_utils.h"

6	6

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

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

9 #include "ui/gfx/font_list.h"	9 #include "ui/gfx/font_list.h"

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

(...skipping 13 matching lines...) Expand all Loading...
24 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));	24 label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));

25 label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0),	25 label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0),

26 SkColorSetARGB(64, 0, 0, 0));	26 SkColorSetARGB(64, 0, 0, 0));

27 label->SetShadowOffset(0, 1);	27 label->SetShadowOffset(0, 1);

28 }	28 }

29	29

30 void SetTrayImageItemBorder(views::View* tray_view,	30 void SetTrayImageItemBorder(views::View* tray_view,

31 ShelfAlignment alignment) {	31 ShelfAlignment alignment) {

32 if (alignment == SHELF_ALIGNMENT_BOTTOM \|\|	32 if (alignment == SHELF_ALIGNMENT_BOTTOM \|\|

33 alignment == SHELF_ALIGNMENT_TOP) {	33 alignment == SHELF_ALIGNMENT_TOP) {

34 tray_view->set_border(views::Border::CreateEmptyBorder(	34 tray_view->SetBorder(views::Border::CreateEmptyBorder(

35 0, kTrayImageItemHorizontalPaddingBottomAlignment,	35 0, kTrayImageItemHorizontalPaddingBottomAlignment,

36 0, kTrayImageItemHorizontalPaddingBottomAlignment));	36 0, kTrayImageItemHorizontalPaddingBottomAlignment));

37 } else {	37 } else {

38 tray_view->set_border(views::Border::CreateEmptyBorder(	38 tray_view->SetBorder(views::Border::CreateEmptyBorder(

39 kTrayImageItemVerticalPaddingVerticalAlignment,	39 kTrayImageItemVerticalPaddingVerticalAlignment,

40 kTrayImageItemHorizontalPaddingVerticalAlignment,	40 kTrayImageItemHorizontalPaddingVerticalAlignment,

41 kTrayImageItemVerticalPaddingVerticalAlignment,	41 kTrayImageItemVerticalPaddingVerticalAlignment,

42 kTrayImageItemHorizontalPaddingVerticalAlignment));	42 kTrayImageItemHorizontalPaddingVerticalAlignment));

43 }	43 }

44 }	44 }

45	45

46 void SetTrayLabelItemBorder(TrayItemView* tray_view,	46 void SetTrayLabelItemBorder(TrayItemView* tray_view,

47 ShelfAlignment alignment) {	47 ShelfAlignment alignment) {

48 if (alignment == SHELF_ALIGNMENT_BOTTOM \|\|	48 if (alignment == SHELF_ALIGNMENT_BOTTOM \|\|

49 alignment == SHELF_ALIGNMENT_TOP) {	49 alignment == SHELF_ALIGNMENT_TOP) {

50 tray_view->set_border(views::Border::CreateEmptyBorder(	50 tray_view->SetBorder(views::Border::CreateEmptyBorder(

51 0, kTrayLabelItemHorizontalPaddingBottomAlignment,	51 0, kTrayLabelItemHorizontalPaddingBottomAlignment,

52 0, kTrayLabelItemHorizontalPaddingBottomAlignment));	52 0, kTrayLabelItemHorizontalPaddingBottomAlignment));

53 } else {	53 } else {

54 // Center the label for vertical launcher alignment.	54 // Center the label for vertical launcher alignment.

55 int horizontal_padding = std::max(0,	55 int horizontal_padding = std::max(0,

56 (tray_view->GetPreferredSize().width() -	56 (tray_view->GetPreferredSize().width() -

57 tray_view->label()->GetPreferredSize().width()) / 2);	57 tray_view->label()->GetPreferredSize().width()) / 2);

58 tray_view->set_border(views::Border::CreateEmptyBorder(	58 tray_view->SetBorder(views::Border::CreateEmptyBorder(

59 kTrayLabelItemVerticalPaddingVerticalAlignment,	59 kTrayLabelItemVerticalPaddingVerticalAlignment,

60 horizontal_padding,	60 horizontal_padding,

61 kTrayLabelItemVerticalPaddingVerticalAlignment,	61 kTrayLabelItemVerticalPaddingVerticalAlignment,

62 horizontal_padding));	62 horizontal_padding));

63 }	63 }

64 }	64 }

65	65

66 } // namespace internal	66 } // namespace internal

67 } // namespace ash	67 } // namespace ash

OLD	NEW