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

Side by Side Diff: chrome/browser/chromeos/net/onc_utils.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/net/onc_utils.h" 5 #include "chrome/browser/chromeos/net/onc_utils.h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/values.h" 11 #include "base/values.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
14 #include "chromeos/network/managed_network_configuration_handler.h" 13 #include "chromeos/network/managed_network_configuration_handler.h"
15 #include "chromeos/network/network_configuration_handler.h" 14 #include "chromeos/network/network_configuration_handler.h"
16 #include "chromeos/network/network_handler.h" 15 #include "chromeos/network/network_handler.h"
17 #include "chromeos/network/network_profile.h" 16 #include "chromeos/network/network_profile.h"
18 #include "chromeos/network/network_profile_handler.h" 17 #include "chromeos/network/network_profile_handler.h"
19 #include "chromeos/network/network_state.h" 18 #include "chromeos/network/network_state.h"
20 #include "chromeos/network/network_state_handler.h" 19 #include "chromeos/network/network_state_handler.h"
21 #include "chromeos/network/network_ui_data.h" 20 #include "chromeos/network/network_ui_data.h"
22 #include "chromeos/network/onc/onc_normalizer.h" 21 #include "chromeos/network/onc/onc_normalizer.h"
23 #include "chromeos/network/onc/onc_signature.h" 22 #include "chromeos/network/onc/onc_signature.h"
24 #include "chromeos/network/onc/onc_translator.h" 23 #include "chromeos/network/onc/onc_translator.h"
25 #include "chromeos/network/onc/onc_utils.h" 24 #include "chromeos/network/onc/onc_utils.h"
25 #include "components/prefs/pref_service.h"
26 #include "components/user_manager/user.h" 26 #include "components/user_manager/user.h"
27 #include "components/user_manager/user_manager.h" 27 #include "components/user_manager/user_manager.h"
28 #include "third_party/cros_system_api/dbus/service_constants.h" 28 #include "third_party/cros_system_api/dbus/service_constants.h"
29 #include "url/gurl.h" 29 #include "url/gurl.h"
30 30
31 namespace chromeos { 31 namespace chromeos {
32 namespace onc { 32 namespace onc {
33 33
34 namespace { 34 namespace {
35 35
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 const PrefService* local_state_prefs, 337 const PrefService* local_state_prefs,
338 const NetworkState& network) { 338 const NetworkState& network) {
339 ::onc::ONCSource ignored_onc_source; 339 ::onc::ONCSource ignored_onc_source;
340 const base::DictionaryValue* policy = onc::GetPolicyForNetwork( 340 const base::DictionaryValue* policy = onc::GetPolicyForNetwork(
341 profile_prefs, local_state_prefs, network, &ignored_onc_source); 341 profile_prefs, local_state_prefs, network, &ignored_onc_source);
342 return policy != NULL; 342 return policy != NULL;
343 } 343 }
344 344
345 } // namespace onc 345 } // namespace onc
346 } // namespace chromeos 346 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698