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

Unified Diff: ash/wm/ash_focus_rules_unittest.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: 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: ash/wm/ash_focus_rules_unittest.cc
diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc
index 542f10f29b163950cc3b9e4e918a609d71635671..bfb8985001dfd917e83e1550b8e4478f29907b63 100644
--- a/ash/wm/ash_focus_rules_unittest.cc
+++ b/ash/wm/ash_focus_rules_unittest.cc
@@ -68,7 +68,7 @@ class LockScreenSessionStateDelegate : public TestSessionStateDelegate {
lock_screen_widget_->GetNativeView()->Focus();
}
- scoped_ptr<views::Widget> lock_screen_widget_;
+ std::unique_ptr<views::Widget> lock_screen_widget_;
DISALLOW_COPY_AND_ASSIGN(LockScreenSessionStateDelegate);
};
@@ -145,8 +145,8 @@ class LockScreenAshFocusRulesTest : public AshTestBase {
// Verifies focus is returned (after unlocking the screen) to the most recent
// window that had it before locking the screen.
TEST_F(LockScreenAshFocusRulesTest, RegainFocusAfterUnlock) {
- scoped_ptr<aura::Window> normal_window(CreateWindowInDefaultContainer());
- scoped_ptr<aura::Window> always_on_top_window(
+ std::unique_ptr<aura::Window> normal_window(CreateWindowInDefaultContainer());
+ std::unique_ptr<aura::Window> always_on_top_window(
CreateWindowInAlwaysOnTopContainer());
wm::ActivateWindow(always_on_top_window.get());

Powered by Google App Engine
This is Rietveld 408576698