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

Side by Side Diff: base/sys_info_ios.mm

Issue 12213061: Move sys_string_conversions to base/strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm him Created 7 years, 10 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
« no previous file with comments | « base/strings/sys_string_conversions_win.cc ('k') | base/sys_string_conversions.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 #include <mach/mach.h> 8 #include <mach/mach.h>
9 #include <sys/sysctl.h> 9 #include <sys/sysctl.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/mac/scoped_mach_port.h" 13 #include "base/mac/scoped_mach_port.h"
14 #include "base/mac/scoped_nsautorelease_pool.h" 14 #include "base/mac/scoped_nsautorelease_pool.h"
15 #include "base/sys_string_conversions.h" 15 #include "base/strings/sys_string_conversions.h"
16 16
17 namespace base { 17 namespace base {
18 18
19 // static 19 // static
20 std::string SysInfo::OperatingSystemName() { 20 std::string SysInfo::OperatingSystemName() {
21 static dispatch_once_t get_system_name_once; 21 static dispatch_once_t get_system_name_once;
22 static std::string* system_name; 22 static std::string* system_name;
23 dispatch_once(&get_system_name_once, ^{ 23 dispatch_once(&get_system_name_once, ^{
24 base::mac::ScopedNSAutoreleasePool pool; 24 base::mac::ScopedNSAutoreleasePool pool;
25 system_name = new std::string( 25 system_name = new std::string(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // static 81 // static
82 std::string SysInfo::CPUModelName() { 82 std::string SysInfo::CPUModelName() {
83 char name[256]; 83 char name[256];
84 size_t len = arraysize(name); 84 size_t len = arraysize(name);
85 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0) 85 if (sysctlbyname("machdep.cpu.brand_string", &name, &len, NULL, 0) == 0)
86 return name; 86 return name;
87 return std::string(); 87 return std::string();
88 } 88 }
89 89
90 } // namespace base 90 } // namespace base
OLDNEW
« no previous file with comments | « base/strings/sys_string_conversions_win.cc ('k') | base/sys_string_conversions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698