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

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.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 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/policy/browser_policy_connector_chromeos.h" 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/prefs/pref_registry_simple.h"
18 #include "base/sequenced_task_runner.h" 17 #include "base/sequenced_task_runner.h"
19 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
20 #include "base/thread_task_runner_handle.h" 19 #include "base/thread_task_runner_handle.h"
21 #include "base/threading/sequenced_worker_pool.h" 20 #include "base/threading/sequenced_worker_pool.h"
22 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h" 21 #include "chrome/browser/chromeos/policy/affiliated_cloud_policy_invalidator.h"
23 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h" 22 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h"
24 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r_impl.h" 23 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r_impl.h"
25 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 24 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
26 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" 25 #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h"
27 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h" 26 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
(...skipping 14 matching lines...) Expand all
42 #include "chromeos/dbus/cryptohome_client.h" 41 #include "chromeos/dbus/cryptohome_client.h"
43 #include "chromeos/dbus/dbus_thread_manager.h" 42 #include "chromeos/dbus/dbus_thread_manager.h"
44 #include "chromeos/network/network_handler.h" 43 #include "chromeos/network/network_handler.h"
45 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 44 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
46 #include "chromeos/settings/cros_settings_names.h" 45 #include "chromeos/settings/cros_settings_names.h"
47 #include "chromeos/settings/cros_settings_provider.h" 46 #include "chromeos/settings/cros_settings_provider.h"
48 #include "chromeos/settings/timezone_settings.h" 47 #include "chromeos/settings/timezone_settings.h"
49 #include "components/policy/core/common/cloud/cloud_policy_client.h" 48 #include "components/policy/core/common/cloud/cloud_policy_client.h"
50 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" 49 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
51 #include "components/policy/core/common/proxy_policy_provider.h" 50 #include "components/policy/core/common/proxy_policy_provider.h"
51 #include "components/prefs/pref_registry_simple.h"
52 #include "content/public/browser/browser_thread.h" 52 #include "content/public/browser/browser_thread.h"
53 #include "google_apis/gaia/gaia_auth_util.h" 53 #include "google_apis/gaia/gaia_auth_util.h"
54 #include "net/url_request/url_request_context_getter.h" 54 #include "net/url_request/url_request_context_getter.h"
55 #include "policy/proto/device_management_backend.pb.h" 55 #include "policy/proto/device_management_backend.pb.h"
56 56
57 using content::BrowserThread; 57 using content::BrowserThread;
58 58
59 namespace policy { 59 namespace policy {
60 60
61 namespace { 61 namespace {
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 device_cloud_policy_manager_->device_store()->policy(); 381 device_cloud_policy_manager_->device_store()->policy();
382 if (policy_data) { 382 if (policy_data) {
383 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), 383 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
384 policy_data->device_affiliation_ids().end()); 384 policy_data->device_affiliation_ids().end());
385 } 385 }
386 } 386 }
387 return affiliation_ids; 387 return affiliation_ids;
388 } 388 }
389 389
390 } // namespace policy 390 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698