| Index: ash/system/tray/system_tray_item.cc
|
| diff --git a/ash/system/tray/system_tray_item.cc b/ash/system/tray/system_tray_item.cc
|
| index 7fb9d78adf0a81dd6d506c7e09c33c688a467664..b2acf08c076764a62c6ffb9a6f3c4ad80008725e 100644
|
| --- a/ash/system/tray/system_tray_item.cc
|
| +++ b/ash/system/tray/system_tray_item.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "ash/system/tray/system_tray_item.h"
|
|
|
| +#include "ash/shell.h"
|
| #include "ash/system/tray/system_tray.h"
|
| +#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ui/views/view.h"
|
|
|
| namespace ash {
|
| @@ -55,6 +57,9 @@ void SystemTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| }
|
|
|
| void SystemTrayItem::PopupDetailedView(int for_seconds, bool activate) {
|
| + // Never show a detailed view during OOBE, e.g. from a notification.
|
| + if (!Shell::GetInstance()->system_tray_delegate()->IsOobeCompleted())
|
| + return;
|
| system_tray()->ShowDetailedView(
|
| this, for_seconds, activate, BUBBLE_CREATE_NEW);
|
| }
|
|
|