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

Unified Diff: ash/shell.cc

Issue 9812043: aura: Uber tray should not show up on start screen in kiosk mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index d1a27098146c5b6ad793ced8cfa83ffe1304185e..ddaa406171af1a2fb7f07eec2c5746079dfbdd17 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -241,6 +241,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
private:
// Overridden from SystemTrayDelegate:
+ virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; }
+
virtual const std::string GetUserDisplayName() const OVERRIDE {
return "Über tray Über tray Über tray Über tray";
}
@@ -598,6 +600,8 @@ void Shell::Init() {
tray_->AddTrayItem(new internal::TraySettings());
tray_->AddTrayItem(tray_accessibility);
tray_->AddTrayItem(tray_caps_lock);
+
+ tray_->SetVisible(tray_delegate_->GetTrayVisibilityOnStartup());
}
if (!status_widget_)
status_widget_ = internal::CreateStatusArea(tray_.get());
« no previous file with comments | « no previous file | ash/system/tray/system_tray_delegate.h » ('j') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698