| Index: chrome/browser/chromeos/app_mode/app_session.h
|
| diff --git a/chrome/browser/chromeos/app_mode/app_session.h b/chrome/browser/chromeos/app_mode/app_session.h
|
| index facc40e27e6e24914d4b6a66ef1d4d9603d47628..959635e5a549e9a5ec42901152ef527a5480e42e 100644
|
| --- a/chrome/browser/chromeos/app_mode/app_session.h
|
| +++ b/chrome/browser/chromeos/app_mode/app_session.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_APP_SESSION_H_
|
| #define CHROME_BROWSER_CHROMEOS_APP_MODE_APP_SESSION_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler_delegate.h"
|
|
|
| class Profile;
|
| @@ -57,9 +57,9 @@ class AppSession : public KioskSessionPluginHandlerDelegate {
|
|
|
| bool is_shutting_down_ = false;
|
|
|
| - scoped_ptr<AppWindowHandler> app_window_handler_;
|
| - scoped_ptr<BrowserWindowHandler> browser_window_handler_;
|
| - scoped_ptr<KioskSessionPluginHandler> plugin_handler_;
|
| + std::unique_ptr<AppWindowHandler> app_window_handler_;
|
| + std::unique_ptr<BrowserWindowHandler> browser_window_handler_;
|
| + std::unique_ptr<KioskSessionPluginHandler> plugin_handler_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppSession);
|
| };
|
|
|