diff options
| author | Iain Merrick <husky@google.com> | 2010-11-01 12:19:54 +0000 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-11-03 10:21:10 +0000 |
| commit | 731df977c0511bca2206b5f333555b1205ff1f43 (patch) | |
| tree | 0e750b949b3f00a1ac11fda25d3c2de512f2b465 /base/message_pump_default.cc | |
| parent | 5add15e10e7bb80512f2c597ca57221314abe577 (diff) | |
| download | external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.zip external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.gz external_chromium-731df977c0511bca2206b5f333555b1205ff1f43.tar.bz2 | |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
Diffstat (limited to 'base/message_pump_default.cc')
| -rw-r--r-- | base/message_pump_default.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/message_pump_default.cc b/base/message_pump_default.cc index d69fc03..518684a 100644 --- a/base/message_pump_default.cc +++ b/base/message_pump_default.cc @@ -5,7 +5,7 @@ #include "base/message_pump_default.h" #include "base/logging.h" -#include "base/scoped_nsautorelease_pool.h" +#include "base/mac/scoped_nsautorelease_pool.h" namespace base { @@ -18,7 +18,7 @@ void MessagePumpDefault::Run(Delegate* delegate) { DCHECK(keep_running_) << "Quit must have been called outside of Run!"; for (;;) { - ScopedNSAutoreleasePool autorelease_pool; + mac::ScopedNSAutoreleasePool autorelease_pool; bool did_work = delegate->DoWork(); if (!keep_running_) |