chrome/utility/importer/safari_importer.mm - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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: chrome/utility/importer/safari_importer.mm

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 4 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: chrome/utility/importer/safari_importer.mm

diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm

index c56b33f29e2f8053222a8c4ba72b9a6257fe4438..480eedd5301015284cb6c9fd5222ed2a4c5fe50b 100644

--- a/chrome/utility/importer/safari_importer.mm

+++ b/chrome/utility/importer/safari_importer.mm

@@ -9,7 +9,7 @@

#include <map>

#include <vector>

-#include "base/file_util.h"

+#include "base/files/file_util.h"

#include "base/mac/mac_util.h"

#include "base/strings/string16.h"

#include "base/strings/sys_string_conversions.h"

@@ -19,9 +19,9 @@

#include "chrome/common/importer/imported_favicon_usage.h"

#include "chrome/common/importer/importer_bridge.h"

#include "chrome/common/url_constants.h"

+#include "chrome/grit/generated_resources.h"

#include "chrome/utility/importer/favicon_reencode.h"

#include "components/strings/grit/components_strings.h"

-#include "chrome/grit/generated_resources.h"

#include "net/base/data_url.h"

#include "sql/statement.h"

#include "url/gurl.h"

« no previous file with comments | « chrome/utility/importer/ie_importer_win.cc ('k') | chrome/utility/importer/safari_importer_unittest.mm » ('j') | no next file with comments »