Re-lands 58186:

base/win_util.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_WIN_UTIL_H__
 #define BASE_WIN_UTIL_H__
 #pragma once
 
 #include <windows.h>
 
 #include <string>
 
-#include "base/keyboard_codes.h"
 #include "base/string16.h"
 
 struct IPropertyStore;
 struct _tagpropertykey;
 typedef _tagpropertykey PROPERTYKEY;
 
 namespace win_util {
 
 // NOTE: Keep these in order so callers can do things like
 // "if (GetWinVersion() > WINVERSION_2000) ...".  It's OK to change the values,
@@ skipping 85 matching lines @@
 // if the OS is Vista.
 bool UserAccountControlIsEnabled();
 
 // Use the Win32 API FormatMessage() function to generate a string, using
 // Windows's default Message Compiled resources; ignoring the inserts.
 std::wstring FormatMessage(unsigned messageid);
 
 // Uses the last Win32 error to generate a human readable message string.
 std::wstring FormatLastWin32Error();
 
-// Methods to convert base::KeyboardCode/Windows virtual key type methods.
-WORD KeyboardCodeToWin(base::KeyboardCode keycode);
-base::KeyboardCode WinToKeyboardCode(WORD keycode);
-
 // Sets the application id in given IPropertyStore. The function is intended
 // for tagging application/chromium shortcut, browser window and jump list for
 // Win7.
 bool SetAppIdForPropertyStore(IPropertyStore* property_store,
                               const wchar_t* app_id);
 
 // Adds the specified |command| using the specified |name| to the AutoRun key.
 // |root_key| could be HKCU or HKLM or the root of any user hive.
 bool AddCommandToAutoRun(HKEY root_key, const string16& name,
                          const string16& command);
 // Removes the command specified by |name| from the AutoRun key. |root_key|
 // could be HKCU or HKLM or the root of any user hive.
 bool RemoveCommandFromAutoRun(HKEY root_key, const string16& name);
 
 }  // namespace win_util
 
 #endif  // BASE_WIN_UTIL_H__