Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/global_keyboard_shortcuts_mac.mm

 // 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 "chrome/browser/global_keyboard_shortcuts_mac.h"
 
 #import <AppKit/AppKit.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 
 namespace {
 
 // Returns the menu item associated with |key| in |menu|, or nil if not found.
 NSMenuItem* FindMenuItem(NSEvent* key, NSMenu* menu) {
   NSMenuItem* result = nil;
 
   for (NSMenuItem* item in [menu itemArray]) {
@@ skipping 269 matching lines @@
       }
     }
 
     // opt/alt modifier is set (e.g. on german layout we want '{' for opt-8).
     if ([event modifierFlags] & NSAlternateKeyMask)
       return rawChar;
   }
 
   return noModifiersChar;
 }