content/browser/web_contents/web_contents_impl.cc - Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/web_contents/navigation_entry_impl.cc ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index fabd43a83df58b7eea4709cc0eb2f2d06c20f1ad..81c00b1d78d4ff6ec6eabbc3a8f2235c00ed1554 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -272,8 +272,8 @@ WebContents* WebContents::CreateWithSessionStorage(

session_storage_namespace_map.begin();

it != session_storage_namespace_map.end();

++it) {

- new_contents->GetController().SetSessionStorageNamespace(it->first,

- it->second);

+ new_contents->GetController()

+ .SetSessionStorageNamespace(it->first, it->second.get());

}

new_contents->Init(params);

@@ -1415,9 +1415,8 @@ void WebContentsImpl::CreateNewWindow(

GetContentClient()->browser()->

GetStoragePartitionIdForSite(GetBrowserContext(),

site_instance->GetSiteURL());

- StoragePartition* partition =

- BrowserContext::GetStoragePartition(GetBrowserContext(),

- site_instance);

+ StoragePartition* partition = BrowserContext::GetStoragePartition(

+ GetBrowserContext(), site_instance.get());

DOMStorageContextImpl* dom_storage_context =

static_cast<DOMStorageContextImpl*>(partition->GetDOMStorageContext());

SessionStorageNamespaceImpl* session_storage_namespace_impl =

@@ -1426,7 +1425,7 @@ void WebContentsImpl::CreateNewWindow(

new_contents->GetController().SetSessionStorageNamespace(

partition_id,

session_storage_namespace);

- CreateParams create_params(GetBrowserContext(), site_instance);

+ CreateParams create_params(GetBrowserContext(), site_instance.get());

create_params.routing_id = route_id;

create_params.main_frame_routing_id = main_frame_route_id;

if (!is_guest) {