diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-01-21 12:13:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 20:14:22 +0000 |
| commit | 7df36b27afc2da124eb826718773fd75ac078f65 (patch) | |
| tree | d2cdceaed95876ed55707cdbc0064af73188c345 /extensions/renderer/guest_view | |
| parent | b2514129e3a9d6961b573da1bfca9df9e55fa0b1 (diff) | |
| download | chromium_src-7df36b27afc2da124eb826718773fd75ac078f65.zip chromium_src-7df36b27afc2da124eb826718773fd75ac078f65.tar.gz chromium_src-7df36b27afc2da124eb826718773fd75ac078f65.tar.bz2 | |
GuestViewBase: More C++ 11'ification
1. Use auto some more where it makes sense to use it.
2. Use for range loops where possible, and useful.
3. Use nullptr keyword instead of NULL define.
4. General cleanup.
BUG=none
Review URL: https://codereview.chromium.org/862943003
Cr-Commit-Position: refs/heads/master@{#312406}
Diffstat (limited to 'extensions/renderer/guest_view')
| -rw-r--r-- | extensions/renderer/guest_view/extensions_guest_view_container.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/renderer/guest_view/extensions_guest_view_container.cc b/extensions/renderer/guest_view/extensions_guest_view_container.cc index cb480b9..c546c3a 100644 --- a/extensions/renderer/guest_view/extensions_guest_view_container.cc +++ b/extensions/renderer/guest_view/extensions_guest_view_container.cc @@ -140,7 +140,7 @@ void ExtensionsGuestViewContainer::DetachRequest::HandleResponse( blink::WebScopedMicrotaskSuppression suppression; // Call the DetachGuest's callback. - callback->Call(context->Global(), 0 /* argc */, NULL); + callback->Call(context->Global(), 0 /* argc */, nullptr); } ExtensionsGuestViewContainer::ExtensionsGuestViewContainer( @@ -175,9 +175,8 @@ ExtensionsGuestViewContainer* ExtensionsGuestViewContainer::FromID( int element_instance_id) { ExtensionsGuestViewContainerMap* guest_view_containers = g_guest_view_container_map.Pointer(); - ExtensionsGuestViewContainerMap::iterator it = - guest_view_containers->find(element_instance_id); - return it == guest_view_containers->end() ? NULL : it->second; + auto it = guest_view_containers->find(element_instance_id); + return it == guest_view_containers->end() ? nullptr : it->second; } void ExtensionsGuestViewContainer::IssueRequest(linked_ptr<Request> request) { |