Skip to content

Commit

Permalink
Merge pull request electron#1491 from atom/minimal-mac-menu
Browse files Browse the repository at this point in the history
Remove native actions in Mac default menu
  • Loading branch information
zcbenz committed Apr 25, 2015
2 parents 0c09142 + ecf29f7 commit ca5ee0f
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 3,120 deletions.
2 changes: 0 additions & 2 deletions atom/browser/mac/atom_application.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@
// CrAppControlProtocol:
- (void)setHandlingSendEvent:(BOOL)handlingSendEvent;

- (IBAction)closeAllWindows:(id)sender;

@end
4 changes: 0 additions & 4 deletions atom/browser/mac/atom_application.mm
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ - (void)awakeFromNib {
andEventID:kAEGetURL];
}

- (IBAction)closeAllWindows:(id)sender {
atom::Browser::Get()->Quit();
}

- (void)handleURLEvent:(NSAppleEventDescriptor*)event
withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
NSString* url = [
Expand Down
10 changes: 0 additions & 10 deletions atom/browser/native_window_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -184,16 +184,6 @@ - (NSRect)constrainFrameRect:(NSRect)frameRect toScreen:(NSScreen*)screen {
return [super constrainFrameRect:frameRect toScreen:screen];
}

- (IBAction)reload:(id)sender {
content::WebContents* web_contents = shell_->GetWebContents();
content::NavigationController::LoadURLParams params(web_contents->GetURL());
web_contents->GetController().LoadURLWithParams(params);
}

- (IBAction)showDevTools:(id)sender {
shell_->OpenDevTools(true);
}

- (id)accessibilityAttributeValue:(NSString*)attribute {
if (![attribute isEqualToString:@"AXChildren"])
return [super accessibilityAttributeValue:attribute];
Expand Down
Loading

0 comments on commit ca5ee0f

Please sign in to comment.