Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Unified Diff: ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_state.cc ('k') | ash/wm/mru_window_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
index 1e5c82f9ca9646f6a608c31057d0ba68fb7c454a..5147d08433865608600971eb116dd34191270a08 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
@@ -6,13 +6,14 @@
#include <X11/Xlib.h>
#include <X11/extensions/XInput2.h>
+
+#include <memory>
#include <set>
#include <utility>
#include "ash/display/window_tree_host_manager.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/client/screen_position_client.h"
@@ -108,7 +109,7 @@ ScopedDisableInternalMouseAndKeyboardX11::
}
// Allow the accessible keys present on the side of some devices to continue
// working.
- scoped_ptr<std::set<ui::KeyboardCode> > excepted_keys(
+ std::unique_ptr<std::set<ui::KeyboardCode>> excepted_keys(
new std::set<ui::KeyboardCode>);
excepted_keys->insert(ui::VKEY_VOLUME_DOWN);
excepted_keys->insert(ui::VKEY_VOLUME_UP);
@@ -131,7 +132,7 @@ ScopedDisableInternalMouseAndKeyboardX11::
if (core_keyboard_device_id_ != kDeviceIdNone)
device_data_manager->EnableDevice(core_keyboard_device_id_);
device_data_manager->SetDisabledKeyboardAllowedKeys(
- scoped_ptr<std::set<ui::KeyboardCode> >());
+ std::unique_ptr<std::set<ui::KeyboardCode>>());
ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
}
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_window_state.cc ('k') | ash/wm/mru_window_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698