ash/wm/screen_dimmer_unittest.cc - Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/screen_dimmer_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:

Index: ash/wm/screen_dimmer_unittest.cc

diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc

index 1939a678bad4f645dcc7a42e64baa9f3ebb72683..e94c727ac29e1a0e0f6974215aff27830a4e70cc 100644

--- a/ash/wm/screen_dimmer_unittest.cc

+++ b/ash/wm/screen_dimmer_unittest.cc

@@ -4,11 +4,12 @@

#include "ash/wm/screen_dimmer.h"

+#include <memory>

#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "ash/wm/dim_window.h"

-#include "base/memory/scoped_ptr.h"

//#include "ui/aura/window_event_dispatcher.h"

#include "ui/aura/test/test_windows.h"

#include "ui/compositor/layer.h"

@@ -95,7 +96,7 @@ TEST_F(ScreenDimmerTest, RootDimmer) {

TEST_F(ScreenDimmerTest, DimAtBottom) {

ScreenDimmer* root_dimmer = ScreenDimmer::GetForRoot();

aura::Window* root_window = Shell::GetPrimaryRootWindow();

- scoped_ptr<aura::Window> window(

+ std::unique_ptr<aura::Window> window(

aura::test::CreateTestWindowWithId(1, root_window));

root_dimmer->SetDimming(true);

std::vector<aura::Window*>::const_iterator dim_iter =

« no previous file with comments | « ash/wm/screen_dimmer.h ('k') | ash/wm/session_state_animator_impl.cc » ('j') | no next file with comments »