| Index: chrome/browser/ui/ash/chrome_keyboard_ui.h
|
| diff --git a/chrome/browser/ui/ash/chrome_keyboard_ui.h b/chrome/browser/ui/ash/chrome_keyboard_ui.h
|
| index 5be78b9c9973e7c78732a1b99f532ff274447fe3..0fc276fedbadad0d59e064bb320bdba44c7f25d4 100644
|
| --- a/chrome/browser/ui/ash/chrome_keyboard_ui.h
|
| +++ b/chrome/browser/ui/ash/chrome_keyboard_ui.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_ASH_CHROME_KEYBOARD_UI_H_
|
| #define CHROME_BROWSER_UI_ASH_CHROME_KEYBOARD_UI_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "ui/keyboard/content/keyboard_ui_content.h"
|
|
|
| @@ -63,7 +64,7 @@ class ChromeKeyboardUI : public keyboard::KeyboardUIContent,
|
| // content::WebContentsObserver overrides
|
| void RenderViewCreated(content::RenderViewHost* render_view_host) override;
|
|
|
| - scoped_ptr<keyboard::KeyboardControllerObserver> observer_;
|
| + std::unique_ptr<keyboard::KeyboardControllerObserver> observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeKeyboardUI);
|
| };
|
|
|