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

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

Issue 2253053003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « content/renderer/render_thread_impl.cc ('k') | 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 CHECK(params.swapped_out); 793 CHECK(params.swapped_out);
794 RenderFrameProxy::CreateFrameProxy( 794 RenderFrameProxy::CreateFrameProxy(
795 params.proxy_routing_id, GetRoutingID(), params.opener_frame_route_id, 795 params.proxy_routing_id, GetRoutingID(), params.opener_frame_route_id,
796 MSG_ROUTING_NONE, params.replicated_frame_state); 796 MSG_ROUTING_NONE, params.replicated_frame_state);
797 } 797 }
798 798
799 if (main_render_frame_) 799 if (main_render_frame_)
800 main_render_frame_->Initialize(); 800 main_render_frame_->Initialize();
801 801
802 #if defined(OS_ANDROID) 802 #if defined(OS_ANDROID)
803 content_detectors_.push_back(base::WrapUnique(new AddressDetector())); 803 content_detectors_.push_back(base::MakeUnique<AddressDetector>());
804 const std::string& contry_iso = 804 const std::string& contry_iso =
805 params.renderer_preferences.network_contry_iso; 805 params.renderer_preferences.network_contry_iso;
806 if (!contry_iso.empty()) { 806 if (!contry_iso.empty()) {
807 content_detectors_.push_back( 807 content_detectors_.push_back(
808 base::WrapUnique(new PhoneNumberDetector(contry_iso))); 808 base::MakeUnique<PhoneNumberDetector>(contry_iso));
809 } 809 }
810 content_detectors_.push_back(base::WrapUnique(new EmailDetector())); 810 content_detectors_.push_back(base::MakeUnique<EmailDetector>());
811 #endif 811 #endif
812 812
813 // If this is a popup, we must wait for the CreatingNew_ACK message before 813 // If this is a popup, we must wait for the CreatingNew_ACK message before
814 // completing initialization. Otherwise, we can finish it now. 814 // completing initialization. Otherwise, we can finish it now.
815 if (opener_id_ == MSG_ROUTING_NONE) 815 if (opener_id_ == MSG_ROUTING_NONE)
816 did_show_ = true; 816 did_show_ = true;
817 817
818 // Set the main frame's name. Only needs to be done for WebLocalFrames, 818 // Set the main frame's name. Only needs to be done for WebLocalFrames,
819 // since the remote case was handled as part of SetReplicatedState on the 819 // since the remote case was handled as part of SetReplicatedState on the
820 // proxy above. 820 // proxy above.
(...skipping 2269 matching lines...) Expand 10 before | Expand all | Expand 10 after
3090 return render_frame->focused_pepper_plugin(); 3090 return render_frame->focused_pepper_plugin();
3091 } 3091 }
3092 frame = frame->traverseNext(false); 3092 frame = frame->traverseNext(false);
3093 } 3093 }
3094 3094
3095 return nullptr; 3095 return nullptr;
3096 } 3096 }
3097 #endif 3097 #endif
3098 3098
3099 } // namespace content 3099 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698