chrome/browser/local_discovery/privet_url_fetcher.h - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/local_discovery/privet_url_fetcher.h

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/local_discovery/privet_http_impl.h ('k') | chrome/browser/local_discovery/pwg_raster_converter.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_	5 #ifndef CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_

6 #define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_	6 #define CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

11 #include "base/memory/weak_ptr.h"	11 #include "base/memory/weak_ptr.h"

12 #include "base/values.h"	12 #include "base/values.h"

13 #include "net/url_request/url_fetcher.h"	13 #include "net/url_request/url_fetcher.h"

14 #include "net/url_request/url_fetcher_delegate.h"	14 #include "net/url_request/url_fetcher_delegate.h"

15 #include "net/url_request/url_request_context_getter.h"	15 #include "net/url_request/url_request_context_getter.h"

16 #include "url/gurl.h"	16 #include "url/gurl.h"

17	17

18 namespace base {	18 namespace base {

19 class FilePath;	19 class FilePath;

20 }	20 }

(...skipping 117 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 base::FilePath upload_file_path_;	138 base::FilePath upload_file_path_;

139 scoped_ptr<net::URLFetcher> url_fetcher_;	139 scoped_ptr<net::URLFetcher> url_fetcher_;

140	140

141 base::WeakPtrFactory<PrivetURLFetcher> weak_factory_;	141 base::WeakPtrFactory<PrivetURLFetcher> weak_factory_;

142 DISALLOW_COPY_AND_ASSIGN(PrivetURLFetcher);	142 DISALLOW_COPY_AND_ASSIGN(PrivetURLFetcher);

143 };	143 };

144	144

145 } // namespace local_discovery	145 } // namespace local_discovery

146	146

147 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_	147 #endif // CHROME_BROWSER_LOCAL_DISCOVERY_PRIVET_URL_FETCHER_H_

OLD	NEW