diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:32:43 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 23:32:43 +0000 |
commit | d7de57877613a63e36facbd485245918c1131f61 (patch) | |
tree | 164f1422c744e42edd84bb92fe347024ab71ec3c /chrome/service/chrome_service_application_mac.mm | |
parent | 5179b9146ce7029e1daedf8607d2bfae50764e7b (diff) | |
download | chromium_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/service/chrome_service_application_mac.mm')
-rw-r--r-- | chrome/service/chrome_service_application_mac.mm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/service/chrome_service_application_mac.mm b/chrome/service/chrome_service_application_mac.mm index 845d9f06..75f6b05 100644 --- a/chrome/service/chrome_service_application_mac.mm +++ b/chrome/service/chrome_service_application_mac.mm @@ -9,14 +9,14 @@ #import "chrome/common/cloud_print/cloud_print_class_mac.h" #include "chrome/common/chrome_switches.h" -@interface ServiceCrApplication () +@interface ServiceApplication () - (void)setCloudPrintHandler; - (void)submitPrint:(NSAppleEventDescriptor*)event; @end -@implementation ServiceCrApplication +@implementation ServiceApplication --(void)setCloudPrintHandler { +- (void)setCloudPrintHandler { NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager]; [em setEventHandler:self andSelector:@selector(submitPrint:) @@ -90,10 +90,10 @@ namespace chrome_service_application_mac { -void RegisterServiceCrApp() { - ServiceCrApplication* var = - static_cast<ServiceCrApplication*> - ([ServiceCrApplication sharedApplication]); +void RegisterServiceApp() { + ServiceApplication* var = + base::mac::ObjCCastStrict<ServiceApplication>( + [ServiceApplication sharedApplication]); [var setCloudPrintHandler]; } |