diff options
| author | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:45:50 +0000 |
|---|---|---|
| committer | hayato@chromium.org <hayato@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 06:45:50 +0000 |
| commit | 62df0a016209f927a61b76cf85f98c68aeea141f (patch) | |
| tree | 82e5496428285c4a40203bb95e24d201b97e3f35 /base/test/mock_chrome_application_mac.mm | |
| parent | 08bfdd6d84eba3f87af54ab14a761d0000f76da5 (diff) | |
| download | chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.zip chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.tar.gz chromium_src-62df0a016209f927a61b76cf85f98c68aeea141f.tar.bz2 | |
Revert 112249 - [Mac] Move ScopedSendingEvent from content/common/mac to base/mac.
Also merge content/ MockCrControlApp into base/ MockCrApp.
BUG=102224
Review URL: http://codereview.chromium.org/8724004
TBR=shess@chromium.org
Review URL: http://codereview.chromium.org/8762020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test/mock_chrome_application_mac.mm')
| -rw-r--r-- | base/test/mock_chrome_application_mac.mm | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/base/test/mock_chrome_application_mac.mm b/base/test/mock_chrome_application_mac.mm index b0b8617..48db419 100644 --- a/base/test/mock_chrome_application_mac.mm +++ b/base/test/mock_chrome_application_mac.mm @@ -4,38 +4,22 @@ #include "base/test/mock_chrome_application_mac.h" -#include "base/auto_reset.h" #include "base/logging.h" @implementation MockCrApp - -+ (NSApplication*)sharedApplication { - NSApplication* app = [super sharedApplication]; - DCHECK([app conformsToProtocol:@protocol(CrAppControlProtocol)]) - << "Existing NSApp (class " << [[app className] UTF8String] - << ") does not conform to required protocol."; - return app; -} - -- (void)sendEvent:(NSEvent*)event { - AutoReset<BOOL> scoper(&handlingSendEvent_, YES); - [super sendEvent:event]; -} - -- (void)setHandlingSendEvent:(BOOL)handlingSendEvent { - handlingSendEvent_ = handlingSendEvent; -} - - (BOOL)isHandlingSendEvent { - return handlingSendEvent_; + return NO; } - @end namespace mock_cr_app { void RegisterMockCrApp() { - [MockCrApp sharedApplication]; + NSApplication* app = [MockCrApp sharedApplication]; + + // Would prefer ASSERT_TRUE() to provide better test failures, but + // this class is used by remoting/ for a non-test use. + DCHECK([app conformsToProtocol:@protocol(CrAppProtocol)]); } } // namespace mock_cr_app |