| Index: chrome/browser/extensions/global_shortcut_listener_win.h
|
| diff --git a/chrome/browser/extensions/global_shortcut_listener_win.h b/chrome/browser/extensions/global_shortcut_listener_win.h
|
| index 7d7d34df8dc39ae414fe01775caa0d299b5cf8a5..833185e34be74e770ad8d323795572c6424198fa 100644
|
| --- a/chrome/browser/extensions/global_shortcut_listener_win.h
|
| +++ b/chrome/browser/extensions/global_shortcut_listener_win.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <windows.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/global_shortcut_listener.h"
|
| #include "ui/gfx/win/singleton_hwnd_observer.h"
|
|
|
| @@ -39,7 +40,7 @@ class GlobalShortcutListenerWin : public GlobalShortcutListener {
|
| typedef std::map<ui::Accelerator, int> HotkeyIdMap;
|
| HotkeyIdMap hotkey_ids_;
|
|
|
| - scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
|
| + std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GlobalShortcutListenerWin);
|
| };
|
|
|