diff options
Diffstat (limited to 'chrome/browser/extensions/api')
9 files changed, 10 insertions, 12 deletions
diff --git a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc index 559540b..40aad49d 100644 --- a/chrome/browser/extensions/api/audio/audio_service_chromeos.cc +++ b/chrome/browser/extensions/api/audio/audio_service_chromeos.cc @@ -63,7 +63,7 @@ class AudioServiceImpl : public AudioService, AudioServiceImpl::AudioServiceImpl() : cras_audio_client_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { if (chromeos::DBusThreadManager::IsInitialized() && chromeos::DBusThreadManager::Get()) { cras_audio_client_ = diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc index 4002616..bd106c5 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc @@ -31,7 +31,7 @@ ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile) adapter_(NULL), num_event_listeners_(0), next_socket_id_(1), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { + weak_ptr_factory_(this) { DCHECK(profile_); } diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc index cbe5b49..a1e3a7c 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache.cc @@ -79,8 +79,7 @@ RulesRegistryWithCache::RulesRegistryWithCache( scoped_ptr<RuleStorageOnUI>* ui_part) : RulesRegistry(owner_thread, event_name), ready_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_((profile) ? this - : NULL)), + weak_ptr_factory_((profile) ? this : NULL), storage_on_ui_((profile ? (new RuleStorageOnUI(profile, GetDeclarativeRuleStorageKey( @@ -277,7 +276,7 @@ RulesRegistryWithCache::RuleStorageOnUI::RuleStorageOnUI( registry_(registry), rules_registry_thread_(rules_registry_thread), ready_state_(NOT_READY), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + weak_ptr_factory_(this) {} RulesRegistryWithCache::RuleStorageOnUI::~RuleStorageOnUI() {} diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 5ab2663..c7c73be 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -1201,7 +1201,7 @@ ExtensionDownloadsEventRouter::ExtensionDownloadsEventRouter( Profile* profile, DownloadManager* manager) : profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST(notifier_(manager, this)) { + notifier_(manager, this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(profile_); extensions::EventRouter* router = extensions::ExtensionSystem::Get(profile_)-> diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc index 23f0e87..c2cbfe1 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.cc @@ -133,7 +133,7 @@ GalleryWatchManager::GalleryFilePathWatcher::GalleryFilePathWatcher( : event_router_(event_router), gallery_id_(gallery_id), on_destroyed_callback_(on_destroyed_callback), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); gallery_path_ = path; AddExtension(extension_id); diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 4269639..7fd4d96 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -103,7 +103,7 @@ ManagedValueStoreCache::ManagedValueStoreCache( Profile* profile, const scoped_refptr<SettingsStorageFactory>& factory, const scoped_refptr<SettingsObserverList>& observers) - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + : weak_factory_(this), weak_this_on_ui_(weak_factory_.GetWeakPtr()), profile_(profile), event_router_(ExtensionSystem::Get(profile)->event_router()), diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc index a6027ca..7e296b9 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc @@ -36,7 +36,7 @@ StreamsPrivateAPI* StreamsPrivateAPI::Get(Profile* profile) { StreamsPrivateAPI::StreamsPrivateAPI(Profile* profile) : profile_(profile), - weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) { + weak_ptr_factory_(this) { (new MimeTypesHandlerParser)->Register(); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index 6851f3f..9cb1f67 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -57,8 +57,7 @@ ExtensionIndicatorIcon::ExtensionIndicatorIcon(const Extension* extension, status_tray_(status_tray), icon_(status_icon), profile_(profile), - ALLOW_THIS_IN_INITIALIZER_LIST( - icon_factory_(profile, extension, action, this)) { + icon_factory_(profile, extension, action, this) { icon_->AddObserver(this); OnIconUpdated(); } diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.cc b/chrome/browser/extensions/api/top_sites/top_sites_api.cc index 986d30d..84d31a3 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.cc @@ -13,7 +13,7 @@ namespace extensions { TopSitesGetFunction::TopSitesGetFunction() - : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} + : weak_ptr_factory_(this) {} TopSitesGetFunction::~TopSitesGetFunction() {} |