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

Unified Diff: chrome/browser/ui/cocoa/info_bubble_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/info_bubble_window.mm
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm
index 029455462f10d34102076525265d0e00123b84d2..99c954239f160c30ebb85caafbdc13cd4d7569e7 100644
--- a/chrome/browser/ui/cocoa/info_bubble_window.mm
+++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
@@ -7,9 +7,11 @@
#include <Carbon/Carbon.h>
#include "base/logging.h"
-#include "base/mac/scoped_nsobject.h"
+#import "base/mac/foundation_util.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/macros.h"
#include "chrome/browser/chrome_notification_types.h"
+#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -141,7 +143,10 @@ class AppNotificationBridge : public content::NotificationObserver {
if (([event keyCode] == kVK_Escape) ||
(([event keyCode] == kVK_ANSI_Period) &&
(([event modifierFlags] & NSCommandKeyMask) != 0))) {
- [[self windowController] cancel:self];
+ BaseBubbleController* bubbleController =
+ base::mac::ObjCCastStrict<BaseBubbleController>(
+ [self windowController]);
+ [bubbleController cancel:self];
return YES;
}
return [super performKeyEquivalent:event];
« no previous file with comments | « chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/info_bubble_window_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698