1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- ui/message_center/views/message_center_button_bar.cc.orig 2016-05-11 19:02:35 UTC
+++ ui/message_center/views/message_center_button_bar.cc
@@ -96,7 +96,7 @@ MessageCenterButtonBar::MessageCenterBut
const base::string16& title)
: message_center_view_(message_center_view),
message_center_(message_center),
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
close_bubble_button_(NULL),
#endif
title_arrow_(NULL),
@@ -171,7 +171,7 @@ MessageCenterButtonBar::MessageCenterBut
IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
button_container_->AddChildView(settings_button_);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
close_bubble_button_ = new views::ImageButton(this);
close_bubble_button_->SetImage(
views::Button::STATE_NORMAL,
@@ -233,7 +233,7 @@ void MessageCenterButtonBar::ViewVisibil
0,
0);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
// The close-bubble button.
column->AddColumn(views::GridLayout::LEADING,
views::GridLayout::LEADING,
@@ -248,7 +248,7 @@ void MessageCenterButtonBar::ViewVisibil
layout->AddView(title_arrow_);
layout->AddView(notification_label_);
layout->AddView(button_container_);
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
layout->AddView(close_bubble_button_);
#endif
}
@@ -295,7 +295,7 @@ void MessageCenterButtonBar::ButtonPress
else
message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
} else if (sender == close_bubble_button_) {
message_center_view()->tray()->HideMessageCenterBubble();
#endif
|
