ash/wm/screen_dimmer_unittest.cc - Issue 10546024: Add RootWindowController

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 10546024: Add RootWindowController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 6 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 ecc6cd5085d39f1ecc7fa8563aa4da1dc0c2d40f..2c40e330129496dbcb092933ca4ca17c2d957108 100644

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

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

@@ -4,6 +4,7 @@

#include "ash/wm/screen_dimmer.h"

+#include "ash/root_window_controller.h"

#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "base/basictypes.h"

@@ -21,7 +22,7 @@ class ScreenDimmerTest : public AshTestBase {

void SetUp() OVERRIDE {

AshTestBase::SetUp();

- dimmer_ = Shell::GetInstance()->screen_dimmer();

+ dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer();

test_api_.reset(new internal::ScreenDimmer::TestApi(dimmer_));

}

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