Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1672)

Unified Diff: ash/system/tray/system_tray_item.cc

Issue 12843019: Suppress error notifications and detailed view during OOBE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
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;
stevenjb 2013/03/22 23:21:06 This is really just a safety net now that we are s
system_tray()->ShowDetailedView(
this, for_seconds, activate, BUBBLE_CREATE_NEW);
}

Powered by Google App Engine
This is Rietveld 408576698