From f0447c026ca7aebd822af995430bbdc0fb4508bb Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 12 Feb 2010 21:40:36 +0000 Subject: [PATCH] 10.6 SDK compatibility fix for SelectFileDialogBridge following r37693. SelectFileDialogBridge should implement the NSOpenSavePanelDelegate protocol. BUG=35569 TEST=10.6 SDK build (mac_sdk=10.6) Review URL: http://codereview.chromium.org/601060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38957 0039d316-1c4b-4281-b951-d872f2087c98 --- base/cocoa_protocols_mac.h | 1 + chrome/browser/cocoa/shell_dialogs_mac.mm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/cocoa_protocols_mac.h b/base/cocoa_protocols_mac.h index f59b3c820509a1..d3d06f48f8abf1 100644 --- a/base/cocoa_protocols_mac.h +++ b/base/cocoa_protocols_mac.h @@ -26,6 +26,7 @@ DEFINE_EMPTY_PROTOCOL(NSAnimationDelegate) DEFINE_EMPTY_PROTOCOL(NSControlTextEditingDelegate) DEFINE_EMPTY_PROTOCOL(NSMatrixDelegate) DEFINE_EMPTY_PROTOCOL(NSMenuDelegate) +DEFINE_EMPTY_PROTOCOL(NSOpenSavePanelDelegate) DEFINE_EMPTY_PROTOCOL(NSOutlineViewDelegate) DEFINE_EMPTY_PROTOCOL(NSTableViewDataSource) DEFINE_EMPTY_PROTOCOL(NSTableViewDelegate) diff --git a/chrome/browser/cocoa/shell_dialogs_mac.mm b/chrome/browser/cocoa/shell_dialogs_mac.mm index 64acbd3b0693b7..7c398e138480c5 100644 --- a/chrome/browser/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/cocoa/shell_dialogs_mac.mm @@ -4,11 +4,13 @@ #include "chrome/browser/shell_dialogs.h" -#include #import +#include + #include #include +#import "base/cocoa_protocols_mac.h" #include "base/logging.h" #include "base/mac_util.h" #include "base/scoped_cftyperef.h" @@ -21,7 +23,7 @@ // A bridge class to act as the modal delegate to the save/open sheet and send // the results to the C++ class. -@interface SelectFileDialogBridge : NSObject { +@interface SelectFileDialogBridge : NSObject { @private SelectFileDialogImpl* selectFileDialogImpl_; // WEAK; owns us }