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

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

index 68e23b8b6dd2dc8115dcc5658788a0a07490b9ac..ba767e85e7a85c5d9ed829424ceba9b888f079f4 100644

--- a/chrome/browser/shell_integration_win.cc

+++ b/chrome/browser/shell_integration_win.cc

@@ -7,12 +7,12 @@

#include <windows.h>

#include <shlwapi.h>

#include <shobjidl.h>

-#include <propkey.h>

+#include <propkey.h> // Needs to come after shobjidl.h.

#include "base/bind.h"

#include "base/command_line.h"

-#include "base/file_util.h"

#include "base/files/file_enumerator.h"

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

#include "base/message_loop/message_loop.h"

#include "base/path_service.h"

#include "base/strings/string_number_conversions.h"

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