summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_application_mac.h
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 23:32:43 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 23:32:43 +0000
commitd7de57877613a63e36facbd485245918c1131f61 (patch)
tree164f1422c744e42edd84bb92fe347024ab71ec3c /chrome/browser/chrome_browser_application_mac.h
parent5179b9146ce7029e1daedf8607d2bfae50764e7b (diff)
downloadchromium_src-d7de57877613a63e36facbd485245918c1131f61.zip
chromium_src-d7de57877613a63e36facbd485245918c1131f61.tar.gz
chromium_src-d7de57877613a63e36facbd485245918c1131f61.tar.bz2
[Mac] Remove content/ CrApplication.
Pull the CrAppProtocol autorelease-pool handling down into MessagePumpCrApplication, which is selected at Create() if NSApp implements the right protocol. UsingCrApp() allows clients to confirm the correct setup (unfortunately, synchronizing NSApp initialization and MessagePump::Create() would be intrusive). Also push CrAppProtocol and CrAppControlProtocol implementation into BrowserCrApplication, and reparent that class from NSApplication. Reparent ServiceCrApplication on NSApplication and rename. Remove CrApplication registration from gpu, plugin, and renderer mains. Remove MockCrApp dependency from remoting sample code. BUG=102224 Review URL: http://codereview.chromium.org/8771028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_application_mac.h')
-rw-r--r--chrome/browser/chrome_browser_application_mac.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/chrome_browser_application_mac.h b/chrome/browser/chrome_browser_application_mac.h
index bab4b65..c6147fd 100644
--- a/chrome/browser/chrome_browser_application_mac.h
+++ b/chrome/browser/chrome_browser_application_mac.h
@@ -8,15 +8,22 @@
#ifdef __OBJC__
-#import "content/common/chrome_application_mac.h"
+#import <AppKit/AppKit.h>
+
+#import "base/mac/scoped_sending_event.h"
+#import "base/memory/scoped_nsobject.h"
+#import "base/message_pump_mac.h"
// Event hooks must implement this protocol.
@protocol CrApplicationEventHookProtocol
- (void)hookForEvent:(NSEvent*)theEvent;
@end
-@interface BrowserCrApplication : CrApplication {
+@interface BrowserCrApplication : NSApplication<CrAppProtocol,
+ CrAppControlProtocol> {
@private
+ BOOL handlingSendEvent_;
+
// Array of objects implementing CrApplicationEventHookProtocol.
scoped_nsobject<NSMutableArray> eventHooks_;
}