chrome/browser/shell_integration_linux.cc - 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/browser/shell_integration_linux.cc

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/browser/shell_integration_linux.cc

diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc

index a521610c73f41d31da6a5bcaf8fd493bd4ca6d1e..905b23f07ced48adc233d82a5a8190acd653fcec 100644

--- a/chrome/browser/shell_integration_linux.cc

+++ b/chrome/browser/shell_integration_linux.cc

@@ -21,9 +21,9 @@

#include "base/base_paths.h"

#include "base/command_line.h"

#include "base/environment.h"

-#include "base/file_util.h"

#include "base/files/file_enumerator.h"

#include "base/files/file_path.h"

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

#include "base/files/scoped_temp_dir.h"

#include "base/i18n/file_util_icu.h"

#include "base/memory/ref_counted_memory.h"

« no previous file with comments | « chrome/browser/shell_integration.cc ('k') | chrome/browser/shell_integration_linux_unittest.cc » ('j') | no next file with comments »