summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 22:55:57 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 22:55:57 +0000
commit5338bbf8f8fdd878943523f61081a80bc717740b (patch)
tree3d7b48be2a597490518e5ec80819086dd3777c76
parent64211b72abe79e98bfa4ca1702e9d438f3ac9208 (diff)
downloadchromium_src-5338bbf8f8fdd878943523f61081a80bc717740b.zip
chromium_src-5338bbf8f8fdd878943523f61081a80bc717740b.tar.gz
chromium_src-5338bbf8f8fdd878943523f61081a80bc717740b.tar.bz2
Fix up broken test_shell due to CL http://codereview.chromium.org/345051.
BUG=none TEST=none Review URL: http://codereview.chromium.org/375001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31153 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell_platform_delegate_mac.mm5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm b/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
index cb2f5df..be7f9c2 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_mac.mm
@@ -10,6 +10,7 @@
#import <objc/objc-runtime.h>
#include <mach/task.h>
+#include "base/chrome_application_mac.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "webkit/tools/test_shell/test_shell.h"
@@ -149,10 +150,10 @@ static void SwizzleNSPasteboard(void) {
TestShellPlatformDelegate::TestShellPlatformDelegate(
const CommandLine &command_line)
: command_line_(command_line) {
+ // Force AppKit to init itself, but don't start the runloop yet
+ [CrApplication sharedApplication];
gTestShellAutoreleasePool = [[NSAutoreleasePool alloc] init];
InitWebCoreSystemInterface();
- // Force AppKit to init itself, but don't start the runloop yet
- [NSApplication sharedApplication];
[NSBundle loadNibNamed:@"MainMenu" owner:NSApp];
}