Unix ifdefs patch for ui/ and webkit/

ui/views/events/accelerator.cc

 // Copyright (c) 2011 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.
 
 #include "ui/views/events/accelerator.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>
 #endif
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 72 matching lines @@
     // layouts have characters other than digits assigned in
     // an unshifted mode (e.g. French AZERY layout has 'a with grave
     // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
     // default zoom level), we leave VK_[0-9] alone without translation.
     wchar_t key;
     if (accelerator.key_code() >= '0' && accelerator.key_code() <= '9')
       key = accelerator.key_code();
     else
       key = LOWORD(::MapVirtualKeyW(accelerator.key_code(), MAPVK_VK_TO_CHAR));
     shortcut += key;
-#elif defined(OS_LINUX)
+#elif defined(TOOLKIT_USES_GTK)
     const gchar* name = NULL;
     switch (accelerator.key_code()) {
       case ui::VKEY_OEM_2:
         name = static_cast<const gchar*>("/");
         break;
       default:
         name = gdk_keyval_name(gdk_keyval_to_lower(accelerator.key_code()));
         break;
     }
     if (name) {
@@ skipping 57 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace ui