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

Side by Side Diff: base/sys_info_chromeos.cc

Issue 101143006: Convert base::file_util to use File instead of PlatformFile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove base:: Created 6 years, 11 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 "base/sys_info.h" 5 #include "base/sys_info.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file.h"
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
12 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
14 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
15 #include "base/strings/string_tokenizer.h" 16 #include "base/strings/string_tokenizer.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
17 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
18 19
19 namespace base { 20 namespace base {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 double us = 0; 65 double us = 0;
65 if (StringToDouble(lsb_release_time_str, &us)) 66 if (StringToDouble(lsb_release_time_str, &us))
66 lsb_release_time_ = Time::FromDoubleT(us); 67 lsb_release_time_ = Time::FromDoubleT(us);
67 } else { 68 } else {
68 // If the LSB_RELEASE and LSB_RELEASE_TIME environment variables are not 69 // If the LSB_RELEASE and LSB_RELEASE_TIME environment variables are not
69 // set, fall back to a blocking read of the lsb_release file. This should 70 // set, fall back to a blocking read of the lsb_release file. This should
70 // only happen in non Chrome OS environments. 71 // only happen in non Chrome OS environments.
71 ThreadRestrictions::ScopedAllowIO allow_io; 72 ThreadRestrictions::ScopedAllowIO allow_io;
72 FilePath path(kLinuxStandardBaseReleaseFile); 73 FilePath path(kLinuxStandardBaseReleaseFile);
73 ReadFileToString(path, &lsb_release); 74 ReadFileToString(path, &lsb_release);
74 PlatformFileInfo fileinfo; 75 File::Info fileinfo;
75 if (GetFileInfo(path, &fileinfo)) 76 if (GetFileInfo(path, &fileinfo))
76 lsb_release_time_ = fileinfo.creation_time; 77 lsb_release_time_ = fileinfo.creation_time;
77 } 78 }
78 ParseLsbRelease(lsb_release); 79 ParseLsbRelease(lsb_release);
79 // For debugging: 80 // For debugging:
80 lsb_release_map_[kLsbReleaseSourceKey] = 81 lsb_release_map_[kLsbReleaseSourceKey] =
81 parsed_from_env ? kLsbReleaseSourceEnv : kLsbReleaseSourceFile; 82 parsed_from_env ? kLsbReleaseSourceEnv : kLsbReleaseSourceFile;
82 } 83 }
83 84
84 bool GetLsbReleaseValue(const std::string& key, std::string* value) { 85 bool GetLsbReleaseValue(const std::string& key, std::string* value) {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 void SysInfo::SetChromeOSVersionInfoForTest(const std::string& lsb_release, 210 void SysInfo::SetChromeOSVersionInfoForTest(const std::string& lsb_release,
210 const Time& lsb_release_time) { 211 const Time& lsb_release_time) {
211 scoped_ptr<Environment> env(Environment::Create()); 212 scoped_ptr<Environment> env(Environment::Create());
212 env->SetVar(kLsbReleaseKey, lsb_release); 213 env->SetVar(kLsbReleaseKey, lsb_release);
213 env->SetVar(kLsbReleaseTimeKey, 214 env->SetVar(kLsbReleaseTimeKey,
214 DoubleToString(lsb_release_time.ToDoubleT())); 215 DoubleToString(lsb_release_time.ToDoubleT()));
215 g_chrome_os_version_info.Get().Parse(); 216 g_chrome_os_version_info.Get().Parse();
216 } 217 }
217 218
218 } // namespace base 219 } // namespace base
OLDNEW
« no previous file with comments | « base/nix/mime_util_xdg.cc ('k') | chrome/browser/browsing_data/browsing_data_database_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698