| Index: ash/system/web_notification/web_notification_tray.cc
|
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
|
| index 89c2deef1d8c4823b6da0ff5d6797c1188a59330..52f47d5c7d95692ed7c88fd1a624b05f03dbefd7 100644
|
| --- a/ash/system/web_notification/web_notification_tray.cc
|
| +++ b/ash/system/web_notification/web_notification_tray.cc
|
| @@ -311,7 +311,7 @@ WebNotificationTray::WebNotificationTray(
|
| ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
|
| tray_container()->AddChildView(button_);
|
| SetContentsBackground();
|
| - tray_container()->set_border(NULL);
|
| + tray_container()->SetBorder(views::Border::NullBorder());
|
| SetVisible(false);
|
| message_center_tray_.reset(new message_center::MessageCenterTray(
|
| this,
|
| @@ -458,7 +458,7 @@ void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
|
| if (alignment == shelf_alignment())
|
| return;
|
| internal::TrayBackgroundView::SetShelfAlignment(alignment);
|
| - tray_container()->set_border(NULL);
|
| + tray_container()->SetBorder(views::Border::NullBorder());
|
| // Destroy any existing bubble so that it will be rebuilt correctly.
|
| message_center_tray_->HideMessageCenterBubble();
|
| message_center_tray_->HidePopupBubble();
|
|
|