diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 04:44:14 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 04:44:14 +0000 |
commit | 997ec9fba33d3dabd0f8dff77008f8c18b1c0e77 (patch) | |
tree | 212fc4b375b7c8ae9cc301dcdf16534649893e61 /webkit | |
parent | 50d19e7175c1f43a6b3ebb9f82c81364746c2f00 (diff) | |
download | chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.zip chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.tar.gz chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.tar.bz2 |
[base] Move AutoReset to base namespace.
NOTRY=true
R=darin@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11308132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/appcache/appcache_database.cc | 2 | ||||
-rw-r--r-- | webkit/database/database_connections.cc | 2 | ||||
-rw-r--r-- | webkit/quota/quota_database.cc | 2 | ||||
-rw-r--r-- | webkit/support/drt_application_mac.mm | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/simple_dom_storage_system.cc | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/webkit/appcache/appcache_database.cc b/webkit/appcache/appcache_database.cc index 90c2d7c..77a8f15 100644 --- a/webkit/appcache/appcache_database.cc +++ b/webkit/appcache/appcache_database.cc @@ -1127,7 +1127,7 @@ bool AppCacheDatabase::DeleteExistingAndCreateNewDatabase() { if (is_recreating_) return false; - AutoReset<bool> auto_reset(&is_recreating_, true); + base::AutoReset<bool> auto_reset(&is_recreating_, true); return LazyOpen(true); } diff --git a/webkit/database/database_connections.cc b/webkit/database/database_connections.cc index e16080c..f6bbfd2 100644 --- a/webkit/database/database_connections.cc +++ b/webkit/database/database_connections.cc @@ -131,7 +131,7 @@ void DatabaseConnectionsWrapper::WaitForAllDatabasesToClose() { // We assume that new databases won't be open while we're waiting. DCHECK(main_thread_->BelongsToCurrentThread()); if (HasOpenConnections()) { - AutoReset<bool> auto_reset(&waiting_for_dbs_to_close_, true); + base::AutoReset<bool> auto_reset(&waiting_for_dbs_to_close_, true); MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current()); MessageLoop::current()->Run(); } diff --git a/webkit/quota/quota_database.cc b/webkit/quota/quota_database.cc index 915d5bf..c604c56 100644 --- a/webkit/quota/quota_database.cc +++ b/webkit/quota/quota_database.cc @@ -579,7 +579,7 @@ bool QuotaDatabase::ResetSchema() { if (is_recreating_) return false; - AutoReset<bool> auto_reset(&is_recreating_, true); + base::AutoReset<bool> auto_reset(&is_recreating_, true); return LazyOpen(true); } diff --git a/webkit/support/drt_application_mac.mm b/webkit/support/drt_application_mac.mm index 9b6a5ea..0c2f900 100644 --- a/webkit/support/drt_application_mac.mm +++ b/webkit/support/drt_application_mac.mm @@ -13,7 +13,7 @@ } - (void)sendEvent:(NSEvent*)event { - AutoReset<BOOL> scoper(&handlingSendEvent_, YES); + base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES); [super sendEvent:event]; } diff --git a/webkit/tools/test_shell/simple_dom_storage_system.cc b/webkit/tools/test_shell/simple_dom_storage_system.cc index 4e040e2..0078b4d 100644 --- a/webkit/tools/test_shell/simple_dom_storage_system.cc +++ b/webkit/tools/test_shell/simple_dom_storage_system.cc @@ -161,7 +161,7 @@ void SimpleDomStorageSystem::AreaImpl::setItem( if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); NullableString16 unused; if (!Host()->SetAreaItem(connection_id_, key, newValue, pageUrl, &unused)) @@ -175,7 +175,7 @@ void SimpleDomStorageSystem::AreaImpl::removeItem( if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); string16 notused; Host()->RemoveAreaItem(connection_id_, key, pageUrl, ¬used); } @@ -184,7 +184,7 @@ void SimpleDomStorageSystem::AreaImpl::clear(const WebURL& pageUrl) { if (!Host()) return; - AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); + base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); Host()->ClearArea(connection_id_, pageUrl); } |