| Index: content/browser/cocoa/system_hotkey_helper_mac.h
|
| diff --git a/content/browser/cocoa/system_hotkey_helper_mac.h b/content/browser/cocoa/system_hotkey_helper_mac.h
|
| index 004b2087c78fadbd83cbce1464ffacf68bd78a66..19ecb8889b96f911ab270d5545b95f6d5d5d8a25 100644
|
| --- a/content/browser/cocoa/system_hotkey_helper_mac.h
|
| +++ b/content/browser/cocoa/system_hotkey_helper_mac.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_HELPER_MAC_H_
|
| #define CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_HELPER_MAC_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/memory/weak_ptr.h"
|
|
|
| @@ -48,7 +49,7 @@ class SystemHotkeyHelperMac {
|
| // Parses the system hotkeys from the plist stored in |dictionary|.
|
| void FileDidLoad(NSDictionary* dictionary);
|
|
|
| - scoped_ptr<SystemHotkeyMap> map_;
|
| + std::unique_ptr<SystemHotkeyMap> map_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SystemHotkeyHelperMac);
|
| };
|
|
|