| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "content/common/chrome_application_mac.h" | 5 #import "content/common/chrome_application_mac.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 @interface CrApplication () | 9 @interface CrApplication () |
| 10 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent; | 10 - (void)setHandlingSendEvent:(BOOL)handlingSendEvent; |
| 11 @end | 11 @end |
| 12 | 12 |
| 13 @implementation CrApplication | 13 @implementation CrApplication |
| 14 // Initialize NSApplication using the custom subclass. Check whether NSApp | 14 // Initialize NSApplication using the custom subclass. Check whether NSApp |
| 15 // was already initialized using another class, because that would break | 15 // was already initialized using another class, because that would break |
| 16 // some things. | 16 // some things. |
| 17 + (NSApplication*)sharedApplication { | 17 + (NSApplication*)sharedApplication { |
| 18 NSApplication* app = [super sharedApplication]; | 18 NSApplication* app = [super sharedApplication]; |
| 19 if (![NSApp isKindOfClass:self]) { | 19 if (![NSApp isKindOfClass:self]) { |
| 20 LOG(ERROR) << "NSApp should be of type " << [[self className] UTF8String] | 20 DLOG(ERROR) << "NSApp should be of type " << [[self className] UTF8String] |
| 21 << ", not " << [[NSApp className] UTF8String]; | 21 << ", not " << [[NSApp className] UTF8String]; |
| 22 DCHECK(false) << "NSApp is of wrong type"; | 22 DCHECK(false) << "NSApp is of wrong type"; |
| 23 } | 23 } |
| 24 return app; | 24 return app; |
| 25 } | 25 } |
| 26 | 26 |
| 27 - (id)init { | 27 - (id)init { |
| 28 if ((self = [super init])) { | 28 if ((self = [super init])) { |
| 29 eventHooks_.reset([[NSMutableArray alloc] init]); | 29 eventHooks_.reset([[NSMutableArray alloc] init]); |
| 30 } | 30 } |
| 31 return self; | 31 return self; |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 ScopedSendingEvent::~ScopedSendingEvent() { | 72 ScopedSendingEvent::~ScopedSendingEvent() { |
| 73 [app_ setHandlingSendEvent:handling_]; | 73 [app_ setHandlingSendEvent:handling_]; |
| 74 } | 74 } |
| 75 | 75 |
| 76 void RegisterCrApp() { | 76 void RegisterCrApp() { |
| 77 [CrApplication sharedApplication]; | 77 [CrApplication sharedApplication]; |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace chrome_application_mac | 80 } // namespace chrome_application_mac |
| OLD | NEW |