| Index: chrome/browser/chromeos/login/screens/error_screen.h
|
| diff --git a/chrome/browser/chromeos/login/screens/error_screen.h b/chrome/browser/chromeos/login/screens/error_screen.h
|
| index a6591719721c063b55ee059596b7451b6034fb8b..7d1bfc609c8e313ba3c2d304d15aab3059e281d6 100644
|
| --- a/chrome/browser/chromeos/login/screens/error_screen.h
|
| +++ b/chrome/browser/chromeos/login/screens/error_screen.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_
|
| #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/chromeos/login/screens/network_error.h"
|
| #include "chrome/browser/chromeos/login/screens/network_error_model.h"
|
| @@ -25,7 +26,7 @@ class NetworkErrorView;
|
| // Controller for the error screen.
|
| class ErrorScreen : public NetworkErrorModel, public LoginPerformer::Delegate {
|
| public:
|
| - typedef scoped_ptr<base::CallbackList<void()>::Subscription>
|
| + typedef std::unique_ptr<base::CallbackList<void()>::Subscription>
|
| ConnectRequestCallbackSubscription;
|
|
|
| ErrorScreen(BaseScreenDelegate* base_screen_delegate, NetworkErrorView* view);
|
| @@ -99,10 +100,10 @@ class ErrorScreen : public NetworkErrorModel, public LoginPerformer::Delegate {
|
|
|
| NetworkErrorView* view_ = nullptr;
|
|
|
| - scoped_ptr<LoginPerformer> guest_login_performer_;
|
| + std::unique_ptr<LoginPerformer> guest_login_performer_;
|
|
|
| // Proxy which manages showing of the window for captive portal entering.
|
| - scoped_ptr<CaptivePortalWindowProxy> captive_portal_window_proxy_;
|
| + std::unique_ptr<CaptivePortalWindowProxy> captive_portal_window_proxy_;
|
|
|
| // Network state informer used to keep error screen up.
|
| scoped_refptr<NetworkStateInformer> network_state_informer_;
|
| @@ -113,7 +114,7 @@ class ErrorScreen : public NetworkErrorModel, public LoginPerformer::Delegate {
|
| OobeScreen parent_screen_ = OobeScreen::SCREEN_UNKNOWN;
|
|
|
| // Optional callback that is called when NetworkError screen is hidden.
|
| - scoped_ptr<base::Closure> on_hide_callback_;
|
| + std::unique_ptr<base::Closure> on_hide_callback_;
|
|
|
| // Callbacks to be invoked when a connection attempt is requested.
|
| base::CallbackList<void()> connect_request_callbacks_;
|
|
|