Index: ash/accelerators/accelerator_controller.h |
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h |
index 2304f089d0fdf3449befd884da6a2dc77dbb8e2c..8e4563297def24de6884f563fda109fae1d415d5 100644 |
--- a/ash/accelerators/accelerator_controller.h |
+++ b/ash/accelerators/accelerator_controller.h |
@@ -8,6 +8,7 @@ |
#include <stddef.h> |
#include <map> |
+#include <memory> |
#include <set> |
#include "ash/accelerators/accelerator_table.h" |
@@ -16,7 +17,6 @@ |
#include "base/compiler_specific.h" |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/base/accelerators/accelerator.h" |
#include "ui/base/accelerators/accelerator_history.h" |
@@ -102,11 +102,11 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
AcceleratorProcessingRestriction GetCurrentAcceleratorRestriction(); |
void SetBrightnessControlDelegate( |
- scoped_ptr<BrightnessControlDelegate> brightness_control_delegate); |
+ std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate); |
void SetImeControlDelegate( |
- scoped_ptr<ImeControlDelegate> ime_control_delegate); |
+ std::unique_ptr<ImeControlDelegate> ime_control_delegate); |
void SetScreenshotDelegate( |
- scoped_ptr<ScreenshotDelegate> screenshot_delegate); |
+ std::unique_ptr<ScreenshotDelegate> screenshot_delegate); |
BrightnessControlDelegate* brightness_control_delegate() const { |
return brightness_control_delegate_.get(); |
} |
@@ -167,21 +167,21 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
int action); |
void SetKeyboardBrightnessControlDelegate( |
- scoped_ptr<KeyboardBrightnessControlDelegate> |
- keyboard_brightness_control_delegate); |
+ std::unique_ptr<KeyboardBrightnessControlDelegate> |
+ keyboard_brightness_control_delegate); |
- scoped_ptr<ui::AcceleratorManager> accelerator_manager_; |
+ std::unique_ptr<ui::AcceleratorManager> accelerator_manager_; |
// A tracker for the current and previous accelerators. |
- scoped_ptr<ui::AcceleratorHistory> accelerator_history_; |
+ std::unique_ptr<ui::AcceleratorHistory> accelerator_history_; |
// TODO(derat): BrightnessControlDelegate is also used by the system tray; |
// move it outside of this class. |
- scoped_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
- scoped_ptr<ImeControlDelegate> ime_control_delegate_; |
- scoped_ptr<KeyboardBrightnessControlDelegate> |
+ std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
+ std::unique_ptr<ImeControlDelegate> ime_control_delegate_; |
+ std::unique_ptr<KeyboardBrightnessControlDelegate> |
keyboard_brightness_control_delegate_; |
- scoped_ptr<ScreenshotDelegate> screenshot_delegate_; |
+ std::unique_ptr<ScreenshotDelegate> screenshot_delegate_; |
// Handles the exit accelerator which requires a double press to exit and |
// shows a popup with an explanation. |