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

Side by Side Diff: chrome/browser/extensions/api/system_cpu/cpu_info_provider_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/extensions/api/system_cpu/cpu_info_provider.h" 5 #include "chrome/browser/extensions/api/system_cpu/cpu_info_provider.h"
6 6
7 #include <cstdio> 7 #include <cstdio>
8 #include <sstream> 8 #include <sstream>
9 9
10 #include "base/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 12
13 namespace extensions { 13 namespace extensions {
14 14
15 namespace { 15 namespace {
16 16
17 const char kProcStat[] = "/proc/stat"; 17 const char kProcStat[] = "/proc/stat";
18 18
19 } // namespace 19 } // namespace
20 20
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 infos->at(pindex)->usage.user = static_cast<double>(user + nice); 61 infos->at(pindex)->usage.user = static_cast<double>(user + nice);
62 infos->at(pindex)->usage.idle = static_cast<double>(idle); 62 infos->at(pindex)->usage.idle = static_cast<double>(idle);
63 infos->at(pindex)->usage.total = static_cast<double>(sys + user + 63 infos->at(pindex)->usage.total = static_cast<double>(sys + user +
64 nice + idle); 64 nice + idle);
65 } 65 }
66 66
67 return true; 67 return true;
68 } 68 }
69 69
70 } // namespace extensions 70 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698