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

Side by Side 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, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/audio/audio_observer.h" 9 #include "ash/system/audio/audio_observer.h"
10 #include "ash/system/bluetooth/bluetooth_observer.h" 10 #include "ash/system/bluetooth/bluetooth_observer.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/chromeos/gdata/gdata_util.h" 40 #include "chrome/browser/chromeos/gdata/gdata_util.h"
41 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 41 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
42 #include "chrome/browser/chromeos/input_method/input_method_util.h" 42 #include "chrome/browser/chromeos/input_method/input_method_util.h"
43 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 43 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
45 #include "chrome/browser/chromeos/login/base_login_display_host.h" 45 #include "chrome/browser/chromeos/login/base_login_display_host.h"
46 #include "chrome/browser/chromeos/login/login_display_host.h" 46 #include "chrome/browser/chromeos/login/login_display_host.h"
47 #include "chrome/browser/chromeos/login/message_bubble.h" 47 #include "chrome/browser/chromeos/login/message_bubble.h"
48 #include "chrome/browser/chromeos/login/user.h" 48 #include "chrome/browser/chromeos/login/user.h"
49 #include "chrome/browser/chromeos/login/user_manager.h" 49 #include "chrome/browser/chromeos/login/user_manager.h"
50 #include "chrome/browser/chromeos/login/wizard_controller.h"
51 #include "chrome/browser/chromeos/mobile_config.h" 50 #include "chrome/browser/chromeos/mobile_config.h"
52 #include "chrome/browser/chromeos/status/data_promo_notification.h" 51 #include "chrome/browser/chromeos/status/data_promo_notification.h"
53 #include "chrome/browser/chromeos/status/network_menu.h" 52 #include "chrome/browser/chromeos/status/network_menu.h"
54 #include "chrome/browser/chromeos/status/network_menu_icon.h" 53 #include "chrome/browser/chromeos/status/network_menu_icon.h"
55 #include "chrome/browser/chromeos/system_key_event_listener.h" 54 #include "chrome/browser/chromeos/system_key_event_listener.h"
56 #include "chrome/browser/chromeos/system/timezone_settings.h" 55 #include "chrome/browser/chromeos/system/timezone_settings.h"
57 #include "chrome/browser/lifetime/application_lifetime.h" 56 #include "chrome/browser/lifetime/application_lifetime.h"
58 #include "chrome/browser/prefs/pref_service.h" 57 #include "chrome/browser/prefs/pref_service.h"
59 #include "chrome/browser/profiles/profile_manager.h" 58 #include "chrome/browser/profiles/profile_manager.h"
60 #include "chrome/browser/ui/browser_finder.h" 59 #include "chrome/browser/ui/browser_finder.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 GDataSystemServiceFactory::FindForProfile(profile); 248 GDataSystemServiceFactory::FindForProfile(profile);
250 if (system_service) { 249 if (system_service) {
251 system_service->docs_service()->operation_registry()-> 250 system_service->docs_service()->operation_registry()->
252 RemoveObserver(this); 251 RemoveObserver(this);
253 } 252 }
254 } 253 }
255 } 254 }
256 255
257 // Overridden from ash::SystemTrayDelegate: 256 // Overridden from ash::SystemTrayDelegate:
258 virtual bool GetTrayVisibilityOnStartup() OVERRIDE { 257 virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
259 // If we're either logged in (doesn't matter in KioskMode or not), 258 // In case of OOBE / sign in screen tray will be shown later.
260 // or not in KioskMode at all, return true. 259 return UserManager::Get()->IsUserLoggedIn();
261 // If not registered i.e. OOBE is still active, start with tray hidden,
262 // it will be enabled if needed by OOBE flow.
263 bool is_registered = chromeos::WizardController::IsDeviceRegistered();
264 return UserManager::Get()->IsUserLoggedIn() ||
265 (!chromeos::KioskModeSettings::Get()->IsKioskModeEnabled() &&
266 is_registered);
267 } 260 }
268 261
269 virtual const string16 GetUserDisplayName() const OVERRIDE { 262 virtual const string16 GetUserDisplayName() const OVERRIDE {
270 return UserManager::Get()->GetLoggedInUser().GetDisplayName(); 263 return UserManager::Get()->GetLoggedInUser().GetDisplayName();
271 } 264 }
272 265
273 virtual const std::string GetUserEmail() const OVERRIDE { 266 virtual const std::string GetUserEmail() const OVERRIDE {
274 return UserManager::Get()->GetLoggedInUser().display_email(); 267 return UserManager::Get()->GetLoggedInUser().display_email();
275 } 268 }
276 269
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1251 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1259 }; 1252 };
1260 1253
1261 } // namespace 1254 } // namespace
1262 1255
1263 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) { 1256 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
1264 return new chromeos::SystemTrayDelegate(tray); 1257 return new chromeos::SystemTrayDelegate(tray);
1265 } 1258 }
1266 1259
1267 } // namespace chromeos 1260 } // namespace chromeos
OLDNEW
« 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