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

Side by Side Diff: chrome/browser/chromeos/ownership/owner_settings_service.cc

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ownership/owner_settings_service.h" 5 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/chromeos/login/users/user.h"
13 #include "chrome/browser/chromeos/login/users/user_manager.h" 12 #include "chrome/browser/chromeos/login/users/user_manager.h"
14 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" 13 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
15 #include "chrome/browser/chromeos/profiles/profile_helper.h" 14 #include "chrome/browser/chromeos/profiles/profile_helper.h"
16 #include "chrome/browser/chromeos/settings/session_manager_operation.h" 15 #include "chrome/browser/chromeos/settings/session_manager_operation.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 17 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
18 #include "components/user_manager/user.h"
19 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
22 #include "content/public/browser/notification_source.h" 22 #include "content/public/browser/notification_source.h"
23 #include "crypto/nss_util.h" 23 #include "crypto/nss_util.h"
24 #include "crypto/nss_util_internal.h" 24 #include "crypto/nss_util_internal.h"
25 #include "crypto/rsa_private_key.h" 25 #include "crypto/rsa_private_key.h"
26 #include "crypto/scoped_nss_types.h" 26 #include "crypto/scoped_nss_types.h"
27 #include "crypto/signature_creator.h" 27 #include "crypto/signature_creator.h"
28 28
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 DeviceSettingsService* OwnerSettingsService::GetDeviceSettingsService() { 490 DeviceSettingsService* OwnerSettingsService::GetDeviceSettingsService() {
491 DCHECK(thread_checker_.CalledOnValidThread()); 491 DCHECK(thread_checker_.CalledOnValidThread());
492 if (g_device_settings_service_for_testing) 492 if (g_device_settings_service_for_testing)
493 return g_device_settings_service_for_testing; 493 return g_device_settings_service_for_testing;
494 if (DeviceSettingsService::IsInitialized()) 494 if (DeviceSettingsService::IsInitialized())
495 return DeviceSettingsService::Get(); 495 return DeviceSettingsService::Get();
496 return NULL; 496 return NULL;
497 } 497 }
498 498
499 } // namespace chromeos 499 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698