| Index: ui/base/accelerators/accelerator.h
|
| diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
|
| index 9e5c2acad9dc6a56c0b6c6b204827b1acb72d1b9..0a02e39d4cc1a4817a4ee5d2106e72b9b38dd472 100644
|
| --- a/ui/base/accelerators/accelerator.h
|
| +++ b/ui/base/accelerators/accelerator.h
|
| @@ -11,6 +11,8 @@
|
| #ifndef UI_BASE_ACCELERATORS_ACCELERATOR_H_
|
| #define UI_BASE_ACCELERATORS_ACCELERATOR_H_
|
|
|
| +#include <utility>
|
| +
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string16.h"
|
| #include "ui/base/accelerators/platform_accelerator.h"
|
| @@ -66,7 +68,7 @@ class UI_BASE_EXPORT Accelerator {
|
| base::string16 GetShortcutText() const;
|
|
|
| void set_platform_accelerator(scoped_ptr<PlatformAccelerator> p) {
|
| - platform_accelerator_ = p.Pass();
|
| + platform_accelerator_ = std::move(p);
|
| }
|
|
|
| // This class keeps ownership of the returned object.
|
|
|