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

Side by Side Diff: content/public/browser/navigation_handle.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/public/browser/navigation_handle.h" 5 #include "content/public/browser/navigation_handle.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/frame_host/navigation_handle_impl.h" 9 #include "content/browser/frame_host/navigation_handle_impl.h"
10 #include "content/browser/frame_host/navigator.h" 10 #include "content/browser/frame_host/navigator.h"
11 #include "content/browser/frame_host/render_frame_host_impl.h" 11 #include "content/browser/frame_host/render_frame_host_impl.h"
12 #include "content/browser/web_contents/web_contents_impl.h" 12 #include "content/browser/web_contents/web_contents_impl.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 WebContents* NavigationHandle::GetWebContents() { 16 WebContents* NavigationHandle::GetWebContents() {
17 // The NavigationHandleImpl cannot access the WebContentsImpl as it would be 17 // The NavigationHandleImpl cannot access the WebContentsImpl as it would be
18 // a layering violation, hence the cast here. 18 // a layering violation, hence the cast here.
19 return static_cast<WebContentsImpl*>( 19 return static_cast<WebContentsImpl*>(
20 static_cast<NavigationHandleImpl*>(this)->GetDelegate()); 20 static_cast<NavigationHandleImpl*>(this)->GetDelegate());
21 } 21 }
22 22
23 // static 23 // static
24 scoped_ptr<NavigationHandle> NavigationHandle::CreateNavigationHandleForTesting( 24 std::unique_ptr<NavigationHandle>
25 NavigationHandle::CreateNavigationHandleForTesting(
25 const GURL& url, 26 const GURL& url,
26 RenderFrameHost* render_frame_host) { 27 RenderFrameHost* render_frame_host) {
27 scoped_ptr<NavigationHandleImpl> handle_impl = NavigationHandleImpl::Create( 28 std::unique_ptr<NavigationHandleImpl> handle_impl =
28 url, 29 NavigationHandleImpl::Create(
29 static_cast<RenderFrameHostImpl*>(render_frame_host)->frame_tree_node(), 30 url, static_cast<RenderFrameHostImpl*>(render_frame_host)
30 false, // is_synchronous 31 ->frame_tree_node(),
31 false, // is_srcdoc 32 false, // is_synchronous
32 base::TimeTicks::Now(), 0); 33 false, // is_srcdoc
33 return scoped_ptr<NavigationHandle>(std::move(handle_impl)); 34 base::TimeTicks::Now(), 0);
35 return std::unique_ptr<NavigationHandle>(std::move(handle_impl));
34 } 36 }
35 37
36 } // namespace content 38 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/navigation_handle.h ('k') | content/public/browser/platform_notification_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698