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

Side by Side Diff: chromeos/network/policy_applicator.cc

Issue 300623008: Move NetworkTypePattern to its own file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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
« no previous file with comments | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/shill_property_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chromeos/network/policy_applicator.h" 5 #include "chromeos/network/policy_applicator.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "chromeos/dbus/shill_profile_client.h" 16 #include "chromeos/dbus/shill_profile_client.h"
17 #include "chromeos/network/network_type_pattern.h"
17 #include "chromeos/network/network_ui_data.h" 18 #include "chromeos/network/network_ui_data.h"
18 #include "chromeos/network/onc/onc_signature.h" 19 #include "chromeos/network/onc/onc_signature.h"
19 #include "chromeos/network/onc/onc_translator.h" 20 #include "chromeos/network/onc/onc_translator.h"
20 #include "chromeos/network/policy_util.h" 21 #include "chromeos/network/policy_util.h"
21 #include "chromeos/network/shill_property_util.h" 22 #include "chromeos/network/shill_property_util.h"
22 #include "components/onc/onc_constants.h" 23 #include "components/onc/onc_constants.h"
23 #include "dbus/object_path.h" 24 #include "dbus/object_path.h"
24 #include "third_party/cros_system_api/dbus/service_constants.h" 25 #include "third_party/cros_system_api/dbus/service_constants.h"
25 26
26 namespace chromeos { 27 namespace chromeos {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 VLOG(1) << "Creating new configuration managed by policy " << *it 337 VLOG(1) << "Creating new configuration managed by policy " << *it
337 << " in profile " << profile_.ToDebugString() << "."; 338 << " in profile " << profile_.ToDebugString() << ".";
338 339
339 scoped_ptr<base::DictionaryValue> shill_dictionary = 340 scoped_ptr<base::DictionaryValue> shill_dictionary =
340 policy_util::CreateShillConfiguration(profile_, *it, policy, NULL); 341 policy_util::CreateShillConfiguration(profile_, *it, policy, NULL);
341 WriteNewShillConfiguration(*shill_dictionary, *policy, false); 342 WriteNewShillConfiguration(*shill_dictionary, *policy, false);
342 } 343 }
343 } 344 }
344 345
345 } // namespace chromeos 346 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_utils.h ('k') | chromeos/network/shill_property_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698