| Index: chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
|
| index dc51ed7292969ea3ace18eb725650e6e0637ac5c..4c066a47de96ee7a03d1bc7b4675369a1849efce 100644
|
| --- a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm
|
| @@ -14,6 +14,7 @@
|
| #include "base/mac/scoped_nsautorelease_pool.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "chrome/app/chrome_command_ids.h" // IDC_*
|
| +#import "chrome/browser/app_controller_mac.h"
|
| #include "chrome/browser/chrome_browser_application_mac.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #import "chrome/browser/ui/cocoa/browser_window_utils.h"
|
| @@ -338,8 +339,10 @@ const double kWidthOfMouseResizeArea = 15.0;
|
| CommandUpdater* command_updater = windowShim_->panel()->command_updater();
|
| if (command_updater->SupportsCommand(tag))
|
| return command_updater->IsCommandEnabled(tag);
|
| - else
|
| - return [[NSApp delegate] validateUserInterfaceItem:item];
|
| +
|
| + AppController* appController =
|
| + base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
|
| + return [appController validateUserInterfaceItem:item];
|
| }
|
| return NO;
|
| }
|
| @@ -350,10 +353,13 @@ const double kWidthOfMouseResizeArea = 15.0;
|
| DCHECK(sender);
|
| NSInteger tag = [sender tag];
|
| CommandUpdater* command_updater = windowShim_->panel()->command_updater();
|
| - if (command_updater->SupportsCommand(tag))
|
| + if (command_updater->SupportsCommand(tag)) {
|
| windowShim_->panel()->ExecuteCommandIfEnabled(tag);
|
| - else
|
| - [[NSApp delegate] commandDispatch:sender];
|
| + } else {
|
| + AppController* appController =
|
| + base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
|
| + [appController commandDispatch:sender];
|
| + }
|
| }
|
|
|
| // Handler for the custom Close button.
|
|
|