Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: chrome/browser/memory_details_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, 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/memory_details.h" 5 #include "chrome/browser/memory_details.h"
6 6
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <unistd.h> 8 #include <unistd.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/file_util.h" 14 #include "base/files/file_util.h"
15 #include "base/process/process_iterator.h" 15 #include "base/process/process_iterator.h"
16 #include "base/process/process_metrics.h" 16 #include "base/process/process_metrics.h"
17 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "chrome/common/chrome_constants.h" 20 #include "chrome/common/chrome_constants.h"
21 #include "chrome/grit/chromium_strings.h" 21 #include "chrome/grit/chromium_strings.h"
22 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
23 #include "content/public/common/process_type.h" 23 #include "content/public/common/process_type.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 #if defined(OS_CHROMEOS) 237 #if defined(OS_CHROMEOS)
238 base::GetSwapInfo(&swap_info_); 238 base::GetSwapInfo(&swap_info_);
239 #endif 239 #endif
240 240
241 // Finally return to the browser thread. 241 // Finally return to the browser thread.
242 BrowserThread::PostTask( 242 BrowserThread::PostTask(
243 BrowserThread::UI, FROM_HERE, 243 BrowserThread::UI, FROM_HERE,
244 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); 244 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this));
245 } 245 }
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/win/mtp_device_operations_util.cc ('k') | chrome/browser/nacl_host/test/mock_nacl_gdb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698