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

Unified Diff: ash/root_window_controller_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: 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/root_window_controller.cc ('k') | ash/rotator/screen_rotation_animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 1c7332851133bd1bfe6e812723fda6a970ab6bae..7386ea187f26f1cd66102b45263d32080746bf38 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -4,6 +4,8 @@
#include "ash/root_window_controller.h"
+#include <memory>
+
#include "ash/display/display_manager.h"
#include "ash/session/session_state_delegate.h"
#include "ash/shelf/shelf_layout_manager.h"
@@ -17,7 +19,6 @@
#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/client/focus_client.h"
#include "ui/aura/client/window_tree_client.h"
@@ -951,11 +952,10 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ZOrderTest) {
// Normal window is partially occluded by the virtual keyboard.
aura::test::TestWindowDelegate delegate;
- scoped_ptr<aura::Window> normal(CreateTestWindowInShellWithDelegateAndType(
- &delegate,
- ui::wm::WINDOW_TYPE_NORMAL,
- 0,
- gfx::Rect(0, 0, window_width, window_height)));
+ std::unique_ptr<aura::Window> normal(
+ CreateTestWindowInShellWithDelegateAndType(
+ &delegate, ui::wm::WINDOW_TYPE_NORMAL, 0,
+ gfx::Rect(0, 0, window_width, window_height)));
normal->set_owned_by_parent(false);
normal->Show();
TargetHitTestEventHandler normal_handler;
@@ -972,10 +972,8 @@ TEST_F(VirtualKeyboardRootWindowControllerTest, ZOrderTest) {
// Menu overlaps virtual keyboard.
aura::test::TestWindowDelegate delegate2;
- scoped_ptr<aura::Window> menu(CreateTestWindowInShellWithDelegateAndType(
- &delegate2,
- ui::wm::WINDOW_TYPE_MENU,
- 0,
+ std::unique_ptr<aura::Window> menu(CreateTestWindowInShellWithDelegateAndType(
+ &delegate2, ui::wm::WINDOW_TYPE_MENU, 0,
gfx::Rect(window_width, 0, window_width, window_height)));
menu->set_owned_by_parent(false);
menu->Show();
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/rotator/screen_rotation_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698