Index: chrome/browser/ui/apps/chrome_app_delegate.h |
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h |
index 37432322e4cfc2dbc249047835edbd02ac2a83dc..568c8a47aa33dac74e6a5ff3b88a45698a2a9960 100644 |
--- a/chrome/browser/ui/apps/chrome_app_delegate.h |
+++ b/chrome/browser/ui/apps/chrome_app_delegate.h |
@@ -5,9 +5,10 @@ |
#ifndef CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ |
#define CHROME_BROWSER_UI_APPS_CHROME_APP_DELEGATE_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -77,8 +78,8 @@ class ChromeAppDelegate : public extensions::AppDelegate, |
bool has_been_shown_; |
bool is_hidden_; |
- scoped_ptr<ScopedKeepAlive> keep_alive_; |
- scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; |
+ std::unique_ptr<ScopedKeepAlive> keep_alive_; |
+ std::unique_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; |
base::Closure terminating_callback_; |
content::NotificationRegistrar registrar_; |
base::WeakPtrFactory<ChromeAppDelegate> weak_factory_; |