summaryrefslogtreecommitdiffstats
path: root/base/worker_pool_mac.mm
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 02:47:39 +0000
commitc2818d44191bc4342c2ae322f3e0cb218dd2ec66 (patch)
treede6265a7e8506e6df679a436cb4df1cd7281a614 /base/worker_pool_mac.mm
parente8b53808f5251d1486dd8b992fa94d96bb604e01 (diff)
downloadchromium_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 'base/worker_pool_mac.mm')
-rw-r--r--base/worker_pool_mac.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/worker_pool_mac.mm b/base/worker_pool_mac.mm
index a301bf8..01c0a98 100644
--- a/base/worker_pool_mac.mm
+++ b/base/worker_pool_mac.mm
@@ -5,8 +5,8 @@
#include "base/worker_pool_mac.h"
#include "base/logging.h"
+#import "base/mac/scoped_nsautorelease_pool.h"
#include "base/metrics/histogram.h"
-#import "base/scoped_nsautorelease_pool.h"
#include "base/scoped_ptr.h"
#import "base/singleton_objc.h"
#include "base/task.h"
@@ -83,7 +83,7 @@ size_t outstanding_ = 0; // Operations posted but not completed.
++running_;
}
- base::ScopedNSAutoreleasePool autoreleasePool;
+ base::mac::ScopedNSAutoreleasePool autoreleasePool;
@try {
task_->Run();
@@ -117,7 +117,7 @@ size_t outstanding_ = 0; // Operations posted but not completed.
bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
Task* task, bool task_is_slow) {
- base::ScopedNSAutoreleasePool autorelease_pool;
+ base::mac::ScopedNSAutoreleasePool autorelease_pool;
// Ignore |task_is_slow|, it doesn't map directly to any tunable aspect of
// an NSOperation.
@@ -157,7 +157,7 @@ bool WorkerPool::PostTask(const tracked_objects::Location& from_here,
++outstanding_;
running_ops = running_;
if (last_check_.is_null() || now - last_check_ > kCheckPeriod) {
- base::ScopedNSAutoreleasePool autoreleasePool;
+ base::mac::ScopedNSAutoreleasePool autoreleasePool;
std::vector<id> ops;
for (id op in [operation_queue operations]) {
// DO NOT RETAIN.