chromeos/network/onc/onc_merger.cc - Issue 11299236: This moves the ONC parsing code into chromeos/network/onc

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/network/onc/onc_merger.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:

Index: chromeos/network/onc/onc_merger.cc

diff --git a/chrome/browser/chromeos/network_settings/onc_merger.cc b/chromeos/network/onc/onc_merger.cc

similarity index 98%

rename from chrome/browser/chromeos/network_settings/onc_merger.cc

rename to chromeos/network/onc/onc_merger.cc

index 7e706fb419342ee7460f1bd8965983b71c7b14f6..fca8d37a3825e9e7e8afd13029b5f707ce08cc25 100644

--- a/chrome/browser/chromeos/network_settings/onc_merger.cc

+++ b/chromeos/network/onc/onc_merger.cc

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/chromeos/network_settings/onc_merger.h"

+#include "chromeos/network/onc/onc_merger.h"

#include <set>

#include <string>

@@ -10,7 +10,7 @@

#include "base/basictypes.h"

#include "base/logging.h"

#include "base/values.h"

-#include "chrome/browser/chromeos/cros/onc_constants.h"

+#include "chromeos/network/onc/onc_constants.h"

namespace chromeos {

namespace onc {

« no previous file with comments | « chromeos/network/onc/onc_merger.h ('k') | chromeos/network/onc/onc_merger_unittest.cc » ('j') | no next file with comments »