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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc

Issue 2452983002: ChromeOS: This CL moves chromeos/login/user_names* to user_mananger. (Closed)
Patch Set: Update after review. Created 4 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/chromeos/settings/cros_settings.h" 31 #include "chrome/browser/chromeos/settings/cros_settings.h"
32 #include "chrome/browser/extensions/external_loader.h" 32 #include "chrome/browser/extensions/external_loader.h"
33 #include "chrome/browser/extensions/external_provider_impl.h" 33 #include "chrome/browser/extensions/external_provider_impl.h"
34 #include "chrome/browser/lifetime/application_lifetime.h" 34 #include "chrome/browser/lifetime/application_lifetime.h"
35 #include "chrome/common/chrome_paths.h" 35 #include "chrome/common/chrome_paths.h"
36 #include "chrome/common/extensions/extension_constants.h" 36 #include "chrome/common/extensions/extension_constants.h"
37 #include "chromeos/chromeos_paths.h" 37 #include "chromeos/chromeos_paths.h"
38 #include "chromeos/cryptohome/async_method_caller.h" 38 #include "chromeos/cryptohome/async_method_caller.h"
39 #include "chromeos/cryptohome/cryptohome_parameters.h" 39 #include "chromeos/cryptohome/cryptohome_parameters.h"
40 #include "chromeos/dbus/dbus_thread_manager.h" 40 #include "chromeos/dbus/dbus_thread_manager.h"
41 #include "chromeos/login/user_names.h"
42 #include "chromeos/settings/cros_settings_names.h" 41 #include "chromeos/settings/cros_settings_names.h"
43 #include "components/ownership/owner_key_util.h" 42 #include "components/ownership/owner_key_util.h"
44 #include "components/prefs/pref_registry_simple.h" 43 #include "components/prefs/pref_registry_simple.h"
45 #include "components/prefs/pref_service.h" 44 #include "components/prefs/pref_service.h"
46 #include "components/prefs/scoped_user_pref_update.h" 45 #include "components/prefs/scoped_user_pref_update.h"
47 #include "components/signin/core/account_id/account_id.h" 46 #include "components/signin/core/account_id/account_id.h"
48 #include "components/user_manager/known_user.h" 47 #include "components/user_manager/known_user.h"
49 #include "components/user_manager/user_manager.h" 48 #include "components/user_manager/user_manager.h"
49 #include "components/user_manager/user_names.h"
xiyuan 2016/10/26 20:51:43 seems no longer used, can we remove it?
Alexander Alekseev 2016/10/26 21:50:48 Done.
50 #include "content/public/browser/browser_thread.h" 50 #include "content/public/browser/browser_thread.h"
51 #include "extensions/common/extension_urls.h" 51 #include "extensions/common/extension_urls.h"
52 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 52 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
53 53
54 namespace chromeos { 54 namespace chromeos {
55 55
56 namespace { 56 namespace {
57 57
58 // Domain that is used for kiosk-app account IDs. 58 // Domain that is used for kiosk-app account IDs.
59 const char kKioskAppAccountDomain[] = "kiosk-apps"; 59 const char kKioskAppAccountDomain[] = "kiosk-apps";
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
875 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const { 875 base::TimeDelta KioskAppManager::GetAutoLaunchDelay() const {
876 int delay; 876 int delay;
877 if (!CrosSettings::Get()->GetInteger( 877 if (!CrosSettings::Get()->GetInteger(
878 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) { 878 kAccountsPrefDeviceLocalAccountAutoLoginDelay, &delay)) {
879 return base::TimeDelta(); // Default delay is 0ms. 879 return base::TimeDelta(); // Default delay is 0ms.
880 } 880 }
881 return base::TimeDelta::FromMilliseconds(delay); 881 return base::TimeDelta::FromMilliseconds(delay);
882 } 882 }
883 883
884 } // namespace chromeos 884 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698