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

Side by Side Diff: chromeos/network/onc/onc_mapper.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
« no previous file with comments | « chromeos/network/onc/onc_mapper.h ('k') | chromeos/network/onc/onc_merger.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 (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_mapper.h" 5 #include "chromeos/network/onc/onc_mapper.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/network_settings/onc_signature.h" 9 #include "chromeos/network/onc/onc_signature.h"
10 10
11 namespace chromeos { 11 namespace chromeos {
12 namespace onc { 12 namespace onc {
13 13
14 Mapper::Mapper() { 14 Mapper::Mapper() {
15 } 15 }
16 16
17 Mapper::~Mapper() { 17 Mapper::~Mapper() {
18 } 18 }
19 19
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 if (result_entry.get() != NULL) 131 if (result_entry.get() != NULL)
132 result_array->Append(result_entry.release()); 132 result_array->Append(result_entry.release());
133 else 133 else
134 *nested_error_occured = true; 134 *nested_error_occured = true;
135 } 135 }
136 return result_array.Pass(); 136 return result_array.Pass();
137 } 137 }
138 138
139 } // namespace onc 139 } // namespace onc
140 } // namespace chromeos 140 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_mapper.h ('k') | chromeos/network/onc/onc_merger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698