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

Side by Side Diff: chromeos/network/onc/onc_translator_shill_to_onc.cc

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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
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/network_settings/onc_translator.h" 5 #include "chromeos/network/onc/onc_translator.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/chromeos/cros/onc_constants.h" 14 #include "chromeos/network/onc/onc_constants.h"
15 #include "chrome/browser/chromeos/network_settings/onc_signature.h" 15 #include "chromeos/network/onc/onc_signature.h"
16 #include "chrome/browser/chromeos/network_settings/onc_translation_tables.h" 16 #include "chromeos/network/onc/onc_translation_tables.h"
17 #include "third_party/cros_system_api/dbus/service_constants.h" 17 #include "third_party/cros_system_api/dbus/service_constants.h"
18 18
19 namespace chromeos { 19 namespace chromeos {
20 namespace onc { 20 namespace onc {
21 21
22 namespace { 22 namespace {
23 23
24 // Converts |str| to a base::Value of the given |type|. If the conversion fails, 24 // Converts |str| to a base::Value of the given |type|. If the conversion fails,
25 // returns NULL. 25 // returns NULL.
26 scoped_ptr<base::Value> ConvertStringToValue(const std::string& str, 26 scoped_ptr<base::Value> ConvertStringToValue(const std::string& str,
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 const base::DictionaryValue& shill_dictionary, 222 const base::DictionaryValue& shill_dictionary,
223 const OncValueSignature* onc_signature) { 223 const OncValueSignature* onc_signature) {
224 CHECK(onc_signature != NULL); 224 CHECK(onc_signature != NULL);
225 225
226 ShillToONCTranslator translator(shill_dictionary, *onc_signature); 226 ShillToONCTranslator translator(shill_dictionary, *onc_signature);
227 return translator.CreateTranslatedONCObject(); 227 return translator.CreateTranslatedONCObject();
228 } 228 }
229 229
230 } // namespace onc 230 } // namespace onc
231 } // namespace chromeos 231 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_translator_onc_to_shill.cc ('k') | chromeos/network/onc/onc_translator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698