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

Unified Diff: base/sys_info_chromeos.cc

Issue 12087091: Move string tokenizer to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/strings/string_tokenizer_unittest.cc ('k') | chrome/browser/character_encoding.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/sys_info_chromeos.cc
diff --git a/base/sys_info_chromeos.cc b/base/sys_info_chromeos.cc
index 92a3f0c4b1a5d2969d7ddcb4b4bbc6569e796ab0..5d3495488fa114edcff446e3617f5e64c586fce1 100644
--- a/base/sys_info_chromeos.cc
+++ b/base/sys_info_chromeos.cc
@@ -10,7 +10,7 @@
#include "base/lazy_instance.h"
#include "base/string_number_conversions.h"
#include "base/string_piece.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
#include "base/threading/thread_restrictions.h"
#include <execinfo.h>
@@ -40,7 +40,7 @@ struct ChromeOSVersionNumbers {
bool parsed;
};
-static base::LazyInstance<ChromeOSVersionNumbers>
+static LazyInstance<ChromeOSVersionNumbers>
g_chrome_os_version_numbers = LAZY_INSTANCE_INITIALIZER;
// static
@@ -52,7 +52,7 @@ void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
// See http://code.google.com/p/chromium/issues/detail?id=60394
// Perhaps the caller ought to cache this?
// Temporary allowing while we work the bug out.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ ThreadRestrictions::ScopedAllowIO allow_io;
FilePath path(kLinuxStandardBaseReleaseFile);
std::string contents;
« no previous file with comments | « base/strings/string_tokenizer_unittest.cc ('k') | chrome/browser/character_encoding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698