Merge 33287 - Mac: improve apparent zorder problems when switching Spaces....

chrome/browser/cocoa/chrome_event_processing_window.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/chrome_event_processing_window.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/browser_command_executor.h"
 #import "chrome/browser/cocoa/browser_frame_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
@@ skipping 51 matching lines @@
   // Handle per-window shortcuts like cmd-1, but do not handle browser-level
   // shortcuts like cmd-left (else, cmd-left would do history navigation even
   // if e.g. the Omnibox has focus).
   if ([self handleExtraWindowKeyboardShortcut:event])
     return YES;
   return [super performKeyEquivalent:event];
 }
 
 - (BOOL)redispatchEvent:(NSEvent*)event {
   DCHECK(event);
-  DCHECK([event window] == self);
+  DCHECK_EQ([event window], self);
   eventHandled_ = YES;
   redispatchingEvent_ = YES;
   [NSApp sendEvent:event];
   redispatchingEvent_ = NO;
 
   // If the event was not handled by [NSApp sendEvent:], the sendEvent:
   // method below will be called, and because |redispatchingEvent_| is YES,
   // |eventHandled_| will be set to NO.
   return eventHandled_;
 }
 
 - (void)sendEvent:(NSEvent*)event {
   if (!redispatchingEvent_)
     [super sendEvent:event];
   else
     eventHandled_ = NO;
 }
 
 @end  // ChromeEventProcessingWindow