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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10834081: Enable wallpaper boot animation for boot into sign in too. Add flag to disable it. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: . Created 8 years, 5 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: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index f28867baa85986654352e70b9f980a4e236de086..6c4a13ad95f845830772c051b6c03acff1fd8454 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -47,7 +47,6 @@
#include "chrome/browser/chromeos/login/message_bubble.h"
#include "chrome/browser/chromeos/login/user.h"
#include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/mobile_config.h"
#include "chrome/browser/chromeos/status/data_promo_notification.h"
#include "chrome/browser/chromeos/status/network_menu.h"
@@ -256,14 +255,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
// Overridden from ash::SystemTrayDelegate:
virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
- // If we're either logged in (doesn't matter in KioskMode or not),
- // or not in KioskMode at all, return true.
- // If not registered i.e. OOBE is still active, start with tray hidden,
- // it will be enabled if needed by OOBE flow.
- bool is_registered = chromeos::WizardController::IsDeviceRegistered();
- return UserManager::Get()->IsUserLoggedIn() ||
- (!chromeos::KioskModeSettings::Get()->IsKioskModeEnabled() &&
- is_registered);
+ // In case of OOBE / sign in screen tray will be shown later.
+ return UserManager::Get()->IsUserLoggedIn();
}
virtual const string16 GetUserDisplayName() const OVERRIDE {
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | chrome/browser/resources/chromeos/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698