diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 02:47:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-18 02:47:39 +0000 |
| commit | c2818d44191bc4342c2ae322f3e0cb218dd2ec66 (patch) | |
| tree | de6265a7e8506e6df679a436cb4df1cd7281a614 /chrome/browser/cocoa/cocoa_test_helper.mm | |
| parent | e8b53808f5251d1486dd8b992fa94d96bb604e01 (diff) | |
| download | chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.zip chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.gz chromium_src-c2818d44191bc4342c2ae322f3e0cb218dd2ec66.tar.bz2 | |
Move scoped_nsdisable_screen_update from base to app/mac
Move scoped_aedesc from base to base/mac
Use namespace and proper Google-style class naming.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3828009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/cocoa_test_helper.mm')
| -rw-r--r-- | chrome/browser/cocoa/cocoa_test_helper.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/cocoa_test_helper.mm b/chrome/browser/cocoa/cocoa_test_helper.mm index 46029aa..136412b 100644 --- a/chrome/browser/cocoa/cocoa_test_helper.mm +++ b/chrome/browser/cocoa/cocoa_test_helper.mm @@ -124,7 +124,7 @@ void CocoaTest::TearDown() { // Autorelease anything thrown up by the event loop. { - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; ++spins; NSEvent *next_event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil @@ -164,7 +164,7 @@ std::set<NSWindow*> CocoaTest::ApplicationWindows() { // Must create a pool here because [NSApp windows] has created an array // with retains on all the windows in it. - base::ScopedNSAutoreleasePool pool; + base::mac::ScopedNSAutoreleasePool pool; NSArray *appWindows = [NSApp windows]; for (NSWindow *window in appWindows) { windows.insert(window); |