chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

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: chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/signin/merge_session_load_page_unittest.cc ('k') | chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h

diff --git a/chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h b/chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h

index e3e81ec602ce964938a13c54d6f116a31fbe5eb0..910357e1142f45432e85aaff544caadb38c980d5 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h

+++ b/chrome/browser/chromeos/login/signin/merge_session_navigation_throttle.h

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_NAVIGATION_THROTTLE_H_

#define CHROME_BROWSER_CHROMEOS_LOGIN_SIGNIN_MERGE_SESSION_NAVIGATION_THROTTLE_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "content/public/browser/navigation_throttle.h"

@@ -19,7 +20,7 @@ class NavigationHandle;

// progress while we are attempting to load a google property.

class MergeSessionNavigationThrottle : public content::NavigationThrottle {

public:

- static scoped_ptr<content::NavigationThrottle> Create(

+ static std::unique_ptr<content::NavigationThrottle> Create(

content::NavigationHandle* handle);

~MergeSessionNavigationThrottle() override;