diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 23:56:17 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 23:56:17 +0000 |
| commit | d47af217ea470077b039d9f4d49f529dd0eda6bd (patch) | |
| tree | f55006b328a59a6f702a8921f0e74f8ef3d82be4 /webkit/support | |
| parent | 7f2c27ac648a224202f59da047e73e9821328f5d (diff) | |
| download | chromium_src-d47af217ea470077b039d9f4d49f529dd0eda6bd.zip chromium_src-d47af217ea470077b039d9f4d49f529dd0eda6bd.tar.gz chromium_src-d47af217ea470077b039d9f4d49f529dd0eda6bd.tar.bz2 | |
[Mac] Move ScopedSendingEvent from content/common/mac to base/mac.
Also merge content/ MockCrControlApp into base/ MockCrApp.
Also use MockCrApp in test_shell_tests, and slight tweak to autorelease pool in test_shell's initialization.
BUG=102224
Review URL: http://codereview.chromium.org/8724004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/drt_application_mac.h | 10 | ||||
| -rw-r--r-- | webkit/support/drt_application_mac.mm | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/webkit/support/drt_application_mac.h b/webkit/support/drt_application_mac.h index 64e91b9..cc03508 100644 --- a/webkit/support/drt_application_mac.h +++ b/webkit/support/drt_application_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,12 +6,18 @@ #define WEBKIT_SUPPORT_DRT_APPLICATION_MAC_H #include "base/message_pump_mac.h" +#include "base/mac/scoped_sending_event.h" -@interface CrDrtApplication : NSApplication<CrAppProtocol> { +@interface CrDrtApplication : NSApplication<CrAppProtocol, + CrAppControlProtocol> { @private BOOL handlingSendEvent_; } +// CrAppProtocol - (BOOL)isHandlingSendEvent; + +// CrAppControlProtocol +- (void)setHandlingSendEvent:(BOOL)handlingSendEvent; @end #endif // WEBKIT_SUPPORT_DRT_APPLICATION_MAC_H diff --git a/webkit/support/drt_application_mac.mm b/webkit/support/drt_application_mac.mm index 06ae4a7..9fc61da 100644 --- a/webkit/support/drt_application_mac.mm +++ b/webkit/support/drt_application_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,4 +15,9 @@ [super sendEvent:event]; handlingSendEvent_ = wasHandlingSendEvent; } + +- (void)setHandlingSendEvent:(BOOL)handlingSendEvent { + handlingSendEvent_ = handlingSendEvent; +} + @end |