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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 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 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/barrier_closure.h" 12 #include "base/barrier_closure.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/files/file_path.h" 14 #include "base/files/file_path.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/prefs/pref_registry_simple.h"
19 #include "base/prefs/pref_service.h"
20 #include "base/prefs/scoped_user_pref_update.h"
21 #include "base/stl_util.h" 18 #include "base/stl_util.h"
22 #include "base/sys_info.h" 19 #include "base/sys_info.h"
23 #include "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/chromeos/app_mode/app_session.h" 21 #include "chrome/browser/chromeos/app_mode/app_session.h"
25 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h" 22 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
26 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h" 23 #include "chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h"
27 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" 24 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
28 #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h" 25 #include "chrome/browser/chromeos/app_mode/kiosk_external_updater.h"
29 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h" 26 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
30 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h" 27 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
31 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 28 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
32 #include "chrome/browser/chromeos/policy/device_local_account.h" 29 #include "chrome/browser/chromeos/policy/device_local_account.h"
33 #include "chrome/browser/chromeos/settings/cros_settings.h" 30 #include "chrome/browser/chromeos/settings/cros_settings.h"
34 #include "chrome/browser/extensions/external_loader.h" 31 #include "chrome/browser/extensions/external_loader.h"
35 #include "chrome/browser/extensions/external_provider_impl.h" 32 #include "chrome/browser/extensions/external_provider_impl.h"
36 #include "chrome/browser/lifetime/application_lifetime.h" 33 #include "chrome/browser/lifetime/application_lifetime.h"
37 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
38 #include "chrome/common/extensions/extension_constants.h" 35 #include "chrome/common/extensions/extension_constants.h"
39 #include "chromeos/chromeos_paths.h" 36 #include "chromeos/chromeos_paths.h"
40 #include "chromeos/cryptohome/async_method_caller.h" 37 #include "chromeos/cryptohome/async_method_caller.h"
41 #include "chromeos/dbus/dbus_thread_manager.h" 38 #include "chromeos/dbus/dbus_thread_manager.h"
42 #include "chromeos/settings/cros_settings_names.h" 39 #include "chromeos/settings/cros_settings_names.h"
43 #include "components/ownership/owner_key_util.h" 40 #include "components/ownership/owner_key_util.h"
41 #include "components/prefs/pref_registry_simple.h"
42 #include "components/prefs/pref_service.h"
43 #include "components/prefs/scoped_user_pref_update.h"
44 #include "components/signin/core/account_id/account_id.h" 44 #include "components/signin/core/account_id/account_id.h"
45 #include "components/user_manager/user_manager.h" 45 #include "components/user_manager/user_manager.h"
46 #include "content/public/browser/browser_thread.h" 46 #include "content/public/browser/browser_thread.h"
47 #include "extensions/common/extension_urls.h" 47 #include "extensions/common/extension_urls.h"
48 48
49 namespace chromeos { 49 namespace chromeos {
50 50
51 namespace { 51 namespace {
52 52
53 // Domain that is used for kiosk-app account IDs. 53 // Domain that is used for kiosk-app account IDs.
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir); 778 *cache_dir = user_data_dir.AppendASCII(kCrxCacheDir);
779 } 779 }
780 780
781 void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) { 781 void KioskAppManager::GetCrxUnpackDir(base::FilePath* unpack_dir) {
782 base::FilePath temp_dir; 782 base::FilePath temp_dir;
783 base::GetTempDir(&temp_dir); 783 base::GetTempDir(&temp_dir);
784 *unpack_dir = temp_dir.AppendASCII(kCrxUnpackDir); 784 *unpack_dir = temp_dir.AppendASCII(kCrxUnpackDir);
785 } 785 }
786 786
787 } // namespace chromeos 787 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698