| Index: chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h b/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
|
| index 71cd9b2869282b7341fc0bab24b8a5f9ac4e5f58..3312f8db66bb1d8106e130a286ae5fe9953cb62d 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
|
| +++ b/chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.h
|
| @@ -38,25 +38,26 @@ class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
|
| // wait for ResizeNativeView() to be called by the base class before
|
| // displaying the constrained window. Otherwise, the window's dimensions will
|
| // be |frame|.
|
| - SigninViewControllerDelegateMac(SigninViewController* signin_view_controller,
|
| - scoped_ptr<content::WebContents> web_contents,
|
| - content::WebContents* host_web_contents,
|
| - NSRect frame,
|
| - bool wait_for_size);
|
| + SigninViewControllerDelegateMac(
|
| + SigninViewController* signin_view_controller,
|
| + std::unique_ptr<content::WebContents> web_contents,
|
| + content::WebContents* host_web_contents,
|
| + NSRect frame,
|
| + bool wait_for_size);
|
|
|
| void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
|
|
|
| // Creates the web view that contains the signin flow in |mode| using
|
| // |profile| as the web content's profile, then sets |delegate| as the created
|
| // web content's delegate.
|
| - static scoped_ptr<content::WebContents> CreateGaiaWebContents(
|
| + static std::unique_ptr<content::WebContents> CreateGaiaWebContents(
|
| content::WebContentsDelegate* delegate,
|
| profiles::BubbleViewMode mode,
|
| Profile* profile,
|
| signin_metrics::AccessPoint access_point);
|
|
|
| - static scoped_ptr<content::WebContents> CreateSyncConfirmationWebContents(
|
| - Profile* profile);
|
| + static std::unique_ptr<content::WebContents>
|
| + CreateSyncConfirmationWebContents(Profile* profile);
|
|
|
| private:
|
| void PerformClose() override;
|
| @@ -72,10 +73,10 @@ class SigninViewControllerDelegateMac : public ConstrainedWindowMacDelegate,
|
|
|
| // The constrained window opened by this delegate to display signin flow
|
| // content.
|
| - scoped_ptr<ConstrainedWindowMac> constrained_window_;
|
| + std::unique_ptr<ConstrainedWindowMac> constrained_window_;
|
|
|
| // The web contents displayed in the constrained window.
|
| - scoped_ptr<content::WebContents> web_contents_;
|
| + std::unique_ptr<content::WebContents> web_contents_;
|
| base::scoped_nsobject<ConstrainedWindowCustomWindow> window_;
|
|
|
| // wait_for_size_ stores whether the dialog should only be shown after its
|
|
|