chrome/browser/renderer_host/pepper/device_id_fetcher.cc - 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/renderer_host/pepper/device_id_fetcher.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, 3 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

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"	5 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h"

6	6

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "base/strings/string_number_conversions.h"	9 #include "base/strings/string_number_conversions.h"

10 #include "chrome/browser/profiles/profile.h"	10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/common/pref_names.h"	11 #include "chrome/common/pref_names.h"

12 #if defined(OS_CHROMEOS)	12 #if defined(OS_CHROMEOS)

13 #include "chromeos/cryptohome/system_salt_getter.h"	13 #include "chromeos/cryptohome/system_salt_getter.h"

14 #endif	14 #endif

15 #include "components/pref_registry/pref_registry_syncable.h"	15 #include "components/pref_registry/pref_registry_syncable.h"

16 #include "content/public/browser/browser_context.h"	16 #include "content/public/browser/browser_context.h"

17 #include "content/public/browser/browser_ppapi_host.h"	17 #include "content/public/browser/browser_ppapi_host.h"

(...skipping 188 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
206 BrowserThread::IO,	206 BrowserThread::IO,

207 FROM_HERE,	207 FROM_HERE,

208 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result));	208 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result));

209 return;	209 return;

210 }	210 }

211 in_progress_ = false;	211 in_progress_ = false;

212 callback_.Run(id, result);	212 callback_.Run(id, result);

213 }	213 }

214	214

215 } // namespace chrome	215 } // namespace chrome

OLD	NEW

« no previous file with comments | « chrome/browser/profiles/profile_shortcut_manager_win.cc ('k') | chrome/browser/resources/pdf/pdf_extension_test.cc » ('j') | no next file with comments »