OLD | NEW |
---|---|
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/login/wallpaper_manager.h" | 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
647 | 647 |
648 base::WorkerPool::PostTask( | 648 base::WorkerPool::PostTask( |
649 FROM_HERE, | 649 FROM_HERE, |
650 base::Bind(&WallpaperManager::DeleteWallpaperInList, | 650 base::Bind(&WallpaperManager::DeleteWallpaperInList, |
651 base::Unretained(this), | 651 base::Unretained(this), |
652 file_to_remove), | 652 file_to_remove), |
653 false); | 653 false); |
654 } | 654 } |
655 | 655 |
656 void WallpaperManager::InitializeRegisteredDeviceWallpaper() { | 656 void WallpaperManager::InitializeRegisteredDeviceWallpaper() { |
657 if (CrosSettingsProvider::TEMPORARILY_UNTRUSTED == | |
658 CrosSettings::Get()->PrepareTrustedValues( | |
659 base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper, | |
660 base::Unretained(this)))) { | |
661 return; | |
662 } | |
bshe
2013/01/17 17:09:41
This seems safe to remove if we are fine to change
Nikita (slow)
2013/01/18 13:09:41
That's fine to omit this check on initial show but
| |
663 bool disable_boot_animation = CommandLine::ForCurrentProcess()-> | 657 bool disable_boot_animation = CommandLine::ForCurrentProcess()-> |
664 HasSwitch(switches::kDisableBootAnimation); | 658 HasSwitch(switches::kDisableBootAnimation); |
665 bool show_users = true; | 659 bool show_users = true; |
666 bool result = CrosSettings::Get()->GetBoolean( | 660 bool result = CrosSettings::Get()->GetBoolean( |
667 kAccountsPrefShowUserNamesOnSignIn, &show_users); | 661 kAccountsPrefShowUserNamesOnSignIn, &show_users); |
668 DCHECK(result) << "Unable to fetch setting " | 662 DCHECK(result) << "Unable to fetch setting " |
669 << kAccountsPrefShowUserNamesOnSignIn; | 663 << kAccountsPrefShowUserNamesOnSignIn; |
670 const chromeos::UserList& users = UserManager::Get()->GetUsers(); | 664 const chromeos::UserList& users = UserManager::Get()->GetUsers(); |
671 if (!show_users || users.empty()) { | 665 if (!show_users || users.empty()) { |
672 // Boot into sign in form, preload default wallpaper. | 666 // Boot into sign in form, preload default wallpaper. |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
921 FROM_HERE, | 915 FROM_HERE, |
922 base::Bind(&WallpaperManager::StartLoad, | 916 base::Bind(&WallpaperManager::StartLoad, |
923 base::Unretained(this), | 917 base::Unretained(this), |
924 email, | 918 email, |
925 info, | 919 info, |
926 update_wallpaper, | 920 update_wallpaper, |
927 valid_path)); | 921 valid_path)); |
928 } | 922 } |
929 | 923 |
930 } // chromeos | 924 } // chromeos |
OLD | NEW |