Move GetWindowsArchitecture() to windows_version.h.

BUG=none TEST=none TBR=brettw Review URL: http://codereview.chromium.org/6624025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76947 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Mar 4, 2011 · 6e5e68d · 6e5e68d
1 parent 60d470a
commit 6e5e68d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/base/win/win_util.cc b/base/win/win_util.cc
@@ -100,17 +100,6 @@ bool UserAccountControlIsEnabled() {
   return (uac_enabled != 0);
 }
 
-WindowsArchitecture GetWindowsArchitecture() {
-  SYSTEM_INFO system_info;
-  GetNativeSystemInfo(&system_info);
-  switch (system_info.wProcessorArchitecture) {
-    case PROCESSOR_ARCHITECTURE_INTEL: return X86_ARCHITECTURE;
-    case PROCESSOR_ARCHITECTURE_AMD64: return X64_ARCHITECTURE;
-    case PROCESSOR_ARCHITECTURE_IA64:  return IA64_ARCHITECTURE;
-    default:                           return OTHER_ARCHITECTURE;
-  }
-}
-
 bool SetAppIdForPropertyStore(IPropertyStore* property_store,
                               const wchar_t* app_id) {
   DCHECK(property_store);

diff --git a/base/win/win_util.h b/base/win/win_util.h
@@ -58,20 +58,6 @@ bool IsAltPressed();
 // if the OS is Vista or later.
 bool UserAccountControlIsEnabled();
 
-enum WindowsArchitecture {
-  X86_ARCHITECTURE,
-  X64_ARCHITECTURE,
-  IA64_ARCHITECTURE,
-  OTHER_ARCHITECTURE,
-};
-
-// Returns the processor architecture this copy of Windows natively uses.
-// For example, given an x64-capable processor, we have three possibilities:
-//   32-bit Chrome running on 32-bit Windows:           X86_ARCHITECTURE
-//   32-bit Chrome running on 64-bit Windows via WOW64: X64_ARCHITECTURE
-//   64-bit Chrome running on 64-bit Windows:           X64_ARCHITECTURE
-WindowsArchitecture GetWindowsArchitecture();
-
 // Sets the application id in given IPropertyStore. The function is intended
 // for tagging application/chromium shortcut, browser window and jump list for
 // Win7.

diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc
@@ -68,6 +68,17 @@ void GetServicePackLevel(int* major, int* minor) {
   *minor = service_pack_minor;
 }
 
+WindowsArchitecture GetWindowsArchitecture() {
+  SYSTEM_INFO system_info;
+  GetNativeSystemInfo(&system_info);
+  switch (system_info.wProcessorArchitecture) {
+    case PROCESSOR_ARCHITECTURE_INTEL: return X86_ARCHITECTURE;
+    case PROCESSOR_ARCHITECTURE_AMD64: return X64_ARCHITECTURE;
+    case PROCESSOR_ARCHITECTURE_IA64:  return IA64_ARCHITECTURE;
+    default:                           return OTHER_ARCHITECTURE;
+  }
+}
+
 WOW64Status GetWOW64Status() {
   static WOW64Status wow64_status =
       GetWOW64StatusForProcess(GetCurrentProcess());

diff --git a/base/win/windows_version.h b/base/win/windows_version.h
@@ -30,6 +30,20 @@ Version GetVersion();
 // Returns the major and minor version of the service pack installed.
 void GetServicePackLevel(int* major, int* minor);
 
+enum WindowsArchitecture {
+  X86_ARCHITECTURE,
+  X64_ARCHITECTURE,
+  IA64_ARCHITECTURE,
+  OTHER_ARCHITECTURE,
+};
+
+// Returns the processor architecture this copy of Windows natively uses.
+// For example, given an x64-capable processor, we have three possibilities:
+//   32-bit Chrome running on 32-bit Windows:           X86_ARCHITECTURE
+//   32-bit Chrome running on 64-bit Windows via WOW64: X64_ARCHITECTURE
+//   64-bit Chrome running on 64-bit Windows:           X64_ARCHITECTURE
+WindowsArchitecture GetWindowsArchitecture();
+
 enum WOW64Status {
   WOW64_DISABLED,
   WOW64_ENABLED,

diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
@@ -11,7 +11,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
-#include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"