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

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 2273783002: Move policy generated files to components/policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed headers Created 4 years, 4 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"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "chromeos/dbus/cryptohome_client.h" 42 #include "chromeos/dbus/cryptohome_client.h"
43 #include "chromeos/dbus/dbus_thread_manager.h" 43 #include "chromeos/dbus/dbus_thread_manager.h"
44 #include "chromeos/network/network_handler.h" 44 #include "chromeos/network/network_handler.h"
45 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 45 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
46 #include "chromeos/settings/cros_settings_names.h" 46 #include "chromeos/settings/cros_settings_names.h"
47 #include "chromeos/settings/cros_settings_provider.h" 47 #include "chromeos/settings/cros_settings_provider.h"
48 #include "chromeos/settings/timezone_settings.h" 48 #include "chromeos/settings/timezone_settings.h"
49 #include "components/policy/core/common/cloud/cloud_policy_client.h" 49 #include "components/policy/core/common/cloud/cloud_policy_client.h"
50 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h" 50 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
51 #include "components/policy/core/common/proxy_policy_provider.h" 51 #include "components/policy/core/common/proxy_policy_provider.h"
52 #include "components/policy/proto/device_management_backend.pb.h"
52 #include "components/prefs/pref_registry_simple.h" 53 #include "components/prefs/pref_registry_simple.h"
53 #include "content/public/browser/browser_thread.h" 54 #include "content/public/browser/browser_thread.h"
54 #include "google_apis/gaia/gaia_auth_util.h" 55 #include "google_apis/gaia/gaia_auth_util.h"
55 #include "net/url_request/url_request_context_getter.h" 56 #include "net/url_request/url_request_context_getter.h"
56 #include "policy/proto/device_management_backend.pb.h"
57 57
58 using content::BrowserThread; 58 using content::BrowserThread;
59 59
60 namespace policy { 60 namespace policy {
61 61
62 namespace { 62 namespace {
63 63
64 // Install attributes for tests. 64 // Install attributes for tests.
65 EnterpriseInstallAttributes* g_testing_install_attributes = NULL; 65 EnterpriseInstallAttributes* g_testing_install_attributes = NULL;
66 66
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 device_cloud_policy_manager_->device_store()->policy(); 334 device_cloud_policy_manager_->device_store()->policy();
335 if (policy_data) { 335 if (policy_data) {
336 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), 336 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
337 policy_data->device_affiliation_ids().end()); 337 policy_data->device_affiliation_ids().end());
338 } 338 }
339 } 339 }
340 return affiliation_ids; 340 return affiliation_ids;
341 } 341 }
342 342
343 } // namespace policy 343 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698