From 569bed9ee1bee6ef78d923cfd46b62cfb854fe66 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 29 Feb 2012 17:30:50 -0800 Subject: [PATCH] Refactor ad hoc delegate methods into BrowserDelegate protocol. --- Atom.xcodeproj/project.pbxproj | 2 ++ Atom/src/Atom.h | 3 ++- Atom/src/AtomController.h | 9 +++------ Atom/src/BrowserDelegate.h | 11 +++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 Atom/src/BrowserDelegate.h diff --git a/Atom.xcodeproj/project.pbxproj b/Atom.xcodeproj/project.pbxproj index 29dcf1f68..17443ff23 100644 --- a/Atom.xcodeproj/project.pbxproj +++ b/Atom.xcodeproj/project.pbxproj @@ -117,6 +117,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 042180E614FF080D00DF25EA /* BrowserDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserDelegate.h; sourceTree = ""; }; 0487C91214FED5360045E5E3 /* Atom.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Atom.app; sourceTree = BUILT_PRODUCTS_DIR; }; 0487C91614FED5360045E5E3 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 0487C91914FED5360045E5E3 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; @@ -377,6 +378,7 @@ 0487C93D14FED6090045E5E3 /* Atom.mm */, 0487C93E14FED6090045E5E3 /* AtomController.h */, 0487C93F14FED6090045E5E3 /* AtomController.mm */, + 042180E614FF080D00DF25EA /* BrowserDelegate.h */, 0487C94014FED6090045E5E3 /* client_handler.h */, 0487C94114FED6090045E5E3 /* client_handler.mm */, 0487C94214FED6090045E5E3 /* main.mm */, diff --git a/Atom/src/Atom.h b/Atom/src/Atom.h index 727de30ca..97be10f20 100755 --- a/Atom/src/Atom.h +++ b/Atom/src/Atom.h @@ -1,3 +1,4 @@ +#import "BrowserDelegate.h" #import "include/cef.h" #import "include/cef_application_mac.h" @@ -5,7 +6,7 @@ class ClientHandler; @class AtomController; -@interface Atom : NSApplication { +@interface Atom : NSApplication { NSView *_hiddenGlobalView; BOOL handlingSendEvent_; CefRefPtr _clientHandler; diff --git a/Atom/src/AtomController.h b/Atom/src/AtomController.h index 038de39b3..fd630dc11 100644 --- a/Atom/src/AtomController.h +++ b/Atom/src/AtomController.h @@ -1,9 +1,11 @@ #import + +#import "BrowserDelegate.h" #import "include/cef.h" class ClientHandler; -@interface AtomController : NSWindowController { +@interface AtomController : NSWindowController { NSView *_webView; NSString *_bootstrapScript; NSString *_pathToOpen; @@ -18,11 +20,6 @@ class ClientHandler; - (void)createBrowser; -- (void)afterCreated; -- (void)loadStart; -- (bool)keyEventOfType:(cef_handler_keyevent_type_t)type code:(int)code modifiers:(int)modifiers isSystemKey:(bool)isSystemKey isAfterJavaScript:(bool)isAfterJavaScript; - - @property (nonatomic, retain) IBOutlet NSView *webView; @end diff --git a/Atom/src/BrowserDelegate.h b/Atom/src/BrowserDelegate.h new file mode 100644 index 000000000..6d94f27be --- /dev/null +++ b/Atom/src/BrowserDelegate.h @@ -0,0 +1,11 @@ +#import +#import "include/cef.h" + +@protocol BrowserDelegate + +@optional +- (void)afterCreated; +- (void)loadStart; +- (bool)keyEventOfType:(cef_handler_keyevent_type_t)type code:(int)code modifiers:(int)modifiers isSystemKey:(bool)isSystemKey isAfterJavaScript:(bool)isAfterJavaScript; + +@end