Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 2003963002: Apply scoped_ptr -> std::unique_ptr conversion to comment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 // If file chooser is still waiting for answer, dispatch empty answer. 847 // If file chooser is still waiting for answer, dispatch empty answer.
848 while (!file_chooser_completions_.empty()) { 848 while (!file_chooser_completions_.empty()) {
849 if (file_chooser_completions_.front()->completion) { 849 if (file_chooser_completions_.front()->completion) {
850 file_chooser_completions_.front()->completion->didChooseFile( 850 file_chooser_completions_.front()->completion->didChooseFile(
851 WebVector<WebString>()); 851 WebVector<WebString>());
852 } 852 }
853 file_chooser_completions_.pop_front(); 853 file_chooser_completions_.pop_front();
854 } 854 }
855 855
856 #if defined(OS_ANDROID) 856 #if defined(OS_ANDROID)
857 // The date/time picker client is both a scoped_ptr member of this class and 857 // The date/time picker client is both a std::unique_ptr member of this class
858 // a RenderViewObserver. Reset it to prevent double deletion. 858 // and a RenderViewObserver. Reset it to prevent double deletion.
859 date_time_picker_client_.reset(); 859 date_time_picker_client_.reset();
860 #endif 860 #endif
861 861
862 #ifndef NDEBUG 862 #ifndef NDEBUG
863 // Make sure we are no longer referenced by the ViewMap or RoutingIDViewMap. 863 // Make sure we are no longer referenced by the ViewMap or RoutingIDViewMap.
864 ViewMap* views = g_view_map.Pointer(); 864 ViewMap* views = g_view_map.Pointer();
865 for (ViewMap::iterator it = views->begin(); it != views->end(); ++it) 865 for (ViewMap::iterator it = views->begin(); it != views->end(); ++it)
866 DCHECK_NE(this, it->second) << "Failed to call Close?"; 866 DCHECK_NE(this, it->second) << "Failed to call Close?";
867 RoutingIDViewMap* routing_id_views = g_routing_id_view_map.Pointer(); 867 RoutingIDViewMap* routing_id_views = g_routing_id_view_map.Pointer();
868 for (RoutingIDViewMap::iterator it = routing_id_views->begin(); 868 for (RoutingIDViewMap::iterator it = routing_id_views->begin();
(...skipping 2517 matching lines...) Expand 10 before | Expand all | Expand 10 after
3386 return render_frame->focused_pepper_plugin(); 3386 return render_frame->focused_pepper_plugin();
3387 } 3387 }
3388 frame = frame->traverseNext(false); 3388 frame = frame->traverseNext(false);
3389 } 3389 }
3390 3390
3391 return nullptr; 3391 return nullptr;
3392 } 3392 }
3393 #endif 3393 #endif
3394 3394
3395 } // namespace content 3395 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698