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

Side by Side Diff: base/win/windows_version.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/values_unittest.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) 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/win/windows_version.h" 5 #include "base/win/windows_version.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/win/registry.h" 11 #include "base/win/registry.h"
12 12
13 namespace base { 13 namespace base {
14 namespace win { 14 namespace win {
15 15
16 // static 16 // static
17 OSInfo* OSInfo::GetInstance() { 17 OSInfo* OSInfo::GetInstance() {
18 // Note: we don't use the Singleton class because it depends on AtExitManager, 18 // Note: we don't use the Singleton class because it depends on AtExitManager,
19 // and it's convenient for other modules to use this classs without it. This 19 // and it's convenient for other modules to use this classs without it. This
20 // pattern is copied from gurl.cc. 20 // pattern is copied from gurl.cc.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 return WOW64_UNKNOWN; 102 return WOW64_UNKNOWN;
103 return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED; 103 return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED;
104 } 104 }
105 105
106 Version GetVersion() { 106 Version GetVersion() {
107 return OSInfo::GetInstance()->version(); 107 return OSInfo::GetInstance()->version();
108 } 108 }
109 109
110 } // namespace win 110 } // namespace win
111 } // namespace base 111 } // namespace base
OLDNEW
« no previous file with comments | « base/values_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698