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

Side by Side Diff: chrome/browser/chromeos/login/user_manager_impl.h

Issue 270663002: Implemented profile-aware owner key loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 6 years, 7 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/containers/hash_tables.h" 13 #include "base/containers/hash_tables.h"
14 #include "base/memory/linked_ptr.h" 14 #include "base/memory/linked_ptr.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "chrome/browser/chromeos/login/login_utils.h" 19 #include "chrome/browser/chromeos/login/login_utils.h"
20 #include "chrome/browser/chromeos/login/multi_profile_user_controller_delegate.h " 20 #include "chrome/browser/chromeos/login/multi_profile_user_controller_delegate.h "
21 #include "chrome/browser/chromeos/login/owner_key_reloader.h"
21 #include "chrome/browser/chromeos/login/user.h" 22 #include "chrome/browser/chromeos/login/user.h"
22 #include "chrome/browser/chromeos/login/user_image_manager_impl.h" 23 #include "chrome/browser/chromeos/login/user_image_manager_impl.h"
23 #include "chrome/browser/chromeos/login/user_manager.h" 24 #include "chrome/browser/chromeos/login/user_manager.h"
24 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 25 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
25 #include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h" 26 #include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"
26 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" 27 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
27 #include "chrome/browser/chromeos/settings/cros_settings.h" 28 #include "chrome/browser/chromeos/settings/cros_settings.h"
28 #include "chrome/browser/chromeos/settings/device_settings_service.h" 29 #include "chrome/browser/chromeos/settings/device_settings_service.h"
29 #include "chromeos/dbus/session_manager_client.h" 30 #include "chromeos/dbus/session_manager_client.h"
30 #include "content/public/browser/notification_observer.h" 31 #include "content/public/browser/notification_observer.h"
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 scoped_ptr<policy::CloudExternalDataPolicyObserver> avatar_policy_observer_; 481 scoped_ptr<policy::CloudExternalDataPolicyObserver> avatar_policy_observer_;
481 482
482 // Observer for the policy that can be used to manage wallpapers. 483 // Observer for the policy that can be used to manage wallpapers.
483 scoped_ptr<policy::CloudExternalDataPolicyObserver> 484 scoped_ptr<policy::CloudExternalDataPolicyObserver>
484 wallpaper_policy_observer_; 485 wallpaper_policy_observer_;
485 486
486 // ID of the user just added to the session that needs to be activated 487 // ID of the user just added to the session that needs to be activated
487 // as soon as user's profile is loaded. 488 // as soon as user's profile is loaded.
488 std::string pending_user_switch_; 489 std::string pending_user_switch_;
489 490
491 OwnerKeyReloader owner_key_reloader_;
492
490 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl); 493 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
491 }; 494 };
492 495
493 } // namespace chromeos 496 } // namespace chromeos
494 497
495 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 498 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698