| Index: ash/system/tray/system_tray.cc
|
| diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
|
| index 267f2a657cd6bf3dc6089cd2c9b329d978e1a47d..d05a69fd06a0486fb88a1249222c07e8165fc857 100644
|
| --- a/ash/system/tray/system_tray.cc
|
| +++ b/ash/system/tray/system_tray.cc
|
| @@ -152,12 +152,12 @@ SystemTray::~SystemTray() {
|
| }
|
| }
|
|
|
| -void SystemTray::InitializeTrayItems(
|
| - SystemTrayDelegate* delegate,
|
| - WebNotificationTray* web_notification_tray) {
|
| +void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate,
|
| + WebNotificationTray* web_notification_tray,
|
| + const gfx::Insets& insets) {
|
| DCHECK(web_notification_tray);
|
| web_notification_tray_ = web_notification_tray;
|
| - TrayBackgroundView::Initialize();
|
| + TrayBackgroundView::Initialize(insets);
|
| CreateItems(delegate);
|
| }
|
|
|
| @@ -606,10 +606,11 @@ base::string16 SystemTray::GetAccessibleTimeString(
|
| base::kKeepAmPm);
|
| }
|
|
|
| -void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
|
| +void SystemTray::SetShelfAlignment(ShelfAlignment alignment,
|
| + const gfx::Insets& insets) {
|
| if (alignment == shelf_alignment())
|
| return;
|
| - TrayBackgroundView::SetShelfAlignment(alignment);
|
| + TrayBackgroundView::SetShelfAlignment(alignment, insets);
|
| UpdateAfterShelfAlignmentChange(alignment);
|
| // Destroy any existing bubble so that it is rebuilt correctly.
|
| CloseSystemBubbleAndDeactivateSystemTray();
|
|
|