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

Unified Diff: ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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
Index: ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc b/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc
index 35cce8d53548fb21fef11e8f1d31c19582da1b5c..8b306f5e5ef5668c4cf644e9bdcfdb8dd013ff84 100644
--- a/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_focus_rules_unittest.cc
@@ -17,8 +17,8 @@ namespace views {
namespace {
-scoped_ptr<Widget> CreateDesktopWidget() {
- scoped_ptr<Widget> widget(new Widget);
+std::unique_ptr<Widget> CreateDesktopWidget() {
+ std::unique_ptr<Widget> widget(new Widget);
Widget::InitParams params = Widget::InitParams(
Widget::InitParams::TYPE_WINDOW);
params.bounds = gfx::Rect(0, 0, 200, 200);
@@ -37,8 +37,8 @@ TEST_F(DesktopFocusRulesTest, DontFocusWindowsInOtherHierarchies) {
// Two widgets (each with a DesktopNativeWidgetAura). |w2| has a child Window
// |w2_child| that is not focusable. |w2_child|'s has a transient parent in
// |w1|.
- scoped_ptr<views::Widget> w1(CreateDesktopWidget());
- scoped_ptr<views::Widget> w2(CreateDesktopWidget());
+ std::unique_ptr<views::Widget> w1(CreateDesktopWidget());
+ std::unique_ptr<views::Widget> w2(CreateDesktopWidget());
aura::test::TestWindowDelegate w2_child_delegate;
w2_child_delegate.set_can_focus(false);
aura::Window* w2_child = new aura::Window(&w2_child_delegate);
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drop_target_win.cc ('k') | ui/views/widget/desktop_aura/desktop_native_cursor_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698