rlz/mac/lib/machine_id_mac.cc - Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location.

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: rlz/mac/lib/machine_id_mac.cc

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: rlz/mac/lib/machine_id_mac.cc

diff --git a/rlz/mac/lib/machine_id_mac.cc b/rlz/mac/lib/machine_id_mac.cc

index fb9a34cb5149fd3ce3bc8417765578cf0615827d..0d26d1dc899a730e593e89e9116bd1e8c87b5a4d 100644

--- a/rlz/mac/lib/machine_id_mac.cc

+++ b/rlz/mac/lib/machine_id_mac.cc

@@ -4,9 +4,9 @@

#include <CoreFoundation/CoreFoundation.h>

#include <IOKit/IOKitLib.h>

+#include <IOKit/network/IOEthernetController.h>

#include <IOKit/network/IOEthernetInterface.h>

#include <IOKit/network/IONetworkInterface.h>

-#include <IOKit/network/IOEthernetController.h>

#include "base/logging.h"

#include "base/mac/foundation_util.h"

@@ -14,7 +14,7 @@

#include "base/mac/scoped_ioobject.h"

#include "base/string16.h"

#include "base/stringprintf.h"

-#include "base/sys_string_conversions.h"

+#include "base/strings/sys_string_conversions.h"

#include "base/utf_string_conversions.h"

namespace rlz_lib {

« no previous file with comments | « remoting/host/policy_hack/policy_watcher_mac.mm ('k') | rlz/mac/lib/rlz_value_store_mac.mm » ('j') | webkit/fileapi/file_system_util.cc » ('J')