Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(803)

Unified Diff: chrome/browser/ui/cocoa/chrome_event_processing_window.mm

Issue 1894903003: Mac: Fix SDK 10.11 Compile errors after clang roll in r387792 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mock BaseBubbleController Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/chrome_event_processing_window.mm
diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
index 6c9e275d56264149f1f2445281f8c0a6e1a6a6d2..53ed04c4a3a6ecd7f2bc4f2fe87dabc9b23cc505 100644
--- a/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
+++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.mm
@@ -5,6 +5,8 @@
#import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
#include "base/logging.h"
+#import "base/mac/foundation_util.h"
+#import "chrome/browser/app_controller_mac.h"
#import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h"
#import "ui/base/cocoa/user_interface_item_command_handler.h"
@@ -78,9 +80,12 @@
// command handler, defer to AppController.
if ([item action] == @selector(commandDispatch:) ||
[item action] == @selector(commandDispatchUsingKeyModifiers:)) {
- return commandHandler_
- ? [commandHandler_ validateUserInterfaceItem:item window:self]
- : [[NSApp delegate] validateUserInterfaceItem:item];
+ if (commandHandler_)
+ return [commandHandler_ validateUserInterfaceItem:item window:self];
+
+ AppController* appController =
+ base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
+ return [appController validateUserInterfaceItem:item];
}
return [super validateUserInterfaceItem:item];

Powered by Google App Engine
This is Rietveld 408576698