| Index: chrome/browser/ui/ime/ime_window.h
|
| diff --git a/chrome/browser/ui/ime/ime_window.h b/chrome/browser/ui/ime/ime_window.h
|
| index 20bb6f26371a5eebbe12d9fcf15aa1619a48e9ff..e97eb55861445fd571f477841c7168c18726fd12 100644
|
| --- a/chrome/browser/ui/ime/ime_window.h
|
| +++ b/chrome/browser/ui/ime/ime_window.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_IME_IME_WINDOW_H_
|
| #define CHROME_BROWSER_UI_IME_IME_WINDOW_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -133,10 +133,10 @@ class ImeWindow : public content::NotificationObserver,
|
| std::string title_;
|
|
|
| // The window icon which is shown in the non client view.
|
| - scoped_ptr<extensions::IconImage> icon_;
|
| + std::unique_ptr<extensions::IconImage> icon_;
|
|
|
| // The web contents for the IME window page web UI.
|
| - scoped_ptr<content::WebContents> web_contents_;
|
| + std::unique_ptr<content::WebContents> web_contents_;
|
|
|
| ImeNativeWindow* native_window_; // Weak, it does self-destruction.
|
|
|
|
|