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

Side by Side Diff: webkit/user_agent/user_agent_util_ios.mm

Issue 13322003: Update the remaining references to sys_string_conversions.h to its new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "webkit/user_agent/user_agent_util.h" 5 #include "webkit/user_agent/user_agent_util.h"
6 6
7 #import <UIKit/UIKit.h> 7 #import <UIKit/UIKit.h>
8 8
9 #include <sys/sysctl.h>
9 #include <string> 10 #include <string>
10 #include <sys/sysctl.h>
11 11
12 #include "base/memory/scoped_nsobject.h" 12 #include "base/memory/scoped_nsobject.h"
13 #include "base/string_util.h"
13 #include "base/stringprintf.h" 14 #include "base/stringprintf.h"
14 #include "base/string_util.h" 15 #include "base/strings/sys_string_conversions.h"
15 #include "base/sys_info.h" 16 #include "base/sys_info.h"
16 #include "base/sys_string_conversions.h"
17 17
18 namespace { 18 namespace {
19 19
20 struct UAVersions { 20 struct UAVersions {
21 const char* safari_version_string; 21 const char* safari_version_string;
22 const char* webkit_version_string; 22 const char* webkit_version_string;
23 }; 23 };
24 24
25 struct OSVersionMap { 25 struct OSVersionMap {
26 int32 major_os_version; 26 int32 major_os_version;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 webkit_glue::BuildOSCpuInfo().c_str(), 170 webkit_glue::BuildOSCpuInfo().c_str(),
171 ua_versions.webkit_version_string, 171 ua_versions.webkit_version_string,
172 product.c_str(), 172 product.c_str(),
173 kernel_version, 173 kernel_version,
174 ua_versions.safari_version_string); 174 ua_versions.safari_version_string);
175 175
176 return user_agent; 176 return user_agent;
177 } 177 }
178 178
179 } // namespace webkit_glue 179 } // namespace webkit_glue
OLDNEW
« webkit/fileapi/file_system_util.cc ('K') | « webkit/tools/test_shell/test_webview_delegate_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698