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

Side by Side Diff: webkit/glue/user_agent.cc

Issue 8695007: Replace TOUCH_UI condition in WebUI with dynamic flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tiny tweaks based on CR feedback Created 9 years 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 | « chrome/common/chrome_switches.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/glue/user_agent.h" 5 #include "webkit/glue/user_agent.h"
6 6
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) 7 #if defined(OS_POSIX) && !defined(OS_MACOSX)
8 #include <sys/utsname.h> 8 #include <sys/utsname.h>
9 #endif 9 #endif
10 10
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 os_major_version, 80 os_major_version,
81 os_minor_version, 81 os_minor_version,
82 architecture_token.c_str() 82 architecture_token.c_str()
83 #elif defined(OS_MACOSX) 83 #elif defined(OS_MACOSX)
84 "Intel Mac OS X %d_%d_%d", 84 "Intel Mac OS X %d_%d_%d",
85 os_major_version, 85 os_major_version,
86 os_minor_version, 86 os_minor_version,
87 os_bugfix_version 87 os_bugfix_version
88 #elif defined(OS_CHROMEOS) 88 #elif defined(OS_CHROMEOS)
89 "CrOS " 89 "CrOS "
90 #if defined(TOUCH_UI)
91 "Touch "
92 #endif
93 "%s %d.%d.%d", 90 "%s %d.%d.%d",
94 cputype.c_str(), // e.g. i686 91 cputype.c_str(), // e.g. i686
95 os_major_version, 92 os_major_version,
96 os_minor_version, 93 os_minor_version,
97 os_bugfix_version 94 os_bugfix_version
98 #else 95 #else
99 "%s %s", 96 "%s %s",
100 unixinfo.sysname, // e.g. Linux 97 unixinfo.sysname, // e.g. Linux
101 cputype.c_str() // e.g. i686 98 cputype.c_str() // e.g. i686
102 #endif 99 #endif
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 WEBKIT_VERSION_MAJOR, 137 WEBKIT_VERSION_MAJOR,
141 WEBKIT_VERSION_MINOR, 138 WEBKIT_VERSION_MINOR,
142 product.c_str(), 139 product.c_str(),
143 WEBKIT_VERSION_MAJOR, 140 WEBKIT_VERSION_MAJOR,
144 WEBKIT_VERSION_MINOR); 141 WEBKIT_VERSION_MINOR);
145 return user_agent; 142 return user_agent;
146 } 143 }
147 144
148 } // namespace webkit_glue 145 } // namespace webkit_glue
149 146
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698