diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:15:06 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:15:06 +0000 |
| commit | 1bca2284b9ec3f2338ca74dc7339a8cfc51a24c9 (patch) | |
| tree | 735b21c0a958ebd2b01da9d01a4a3113dfafab00 /ash/wm/screen_dimmer_unittest.cc | |
| parent | 300172b0511b909db0a91db2c8c0f9e48f4ed054 (diff) | |
| download | chromium_src-1bca2284b9ec3f2338ca74dc7339a8cfc51a24c9.zip chromium_src-1bca2284b9ec3f2338ca74dc7339a8cfc51a24c9.tar.gz chromium_src-1bca2284b9ec3f2338ca74dc7339a8cfc51a24c9.tar.bz2 | |
Revert r141871 "Add RootWindowController that keeps per root window state."
This reverts commit d696be73d92539286ad99338a26ceffe320be7cc.
TBR=oshima@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10545154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/screen_dimmer_unittest.cc')
| -rw-r--r-- | ash/wm/screen_dimmer_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 2c40e33..ecc6cd5 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -4,7 +4,6 @@ #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" @@ -22,7 +21,7 @@ class ScreenDimmerTest : public AshTestBase { void SetUp() OVERRIDE { AshTestBase::SetUp(); - dimmer_ = Shell::GetPrimaryRootWindowController()->screen_dimmer(); + dimmer_ = Shell::GetInstance()->screen_dimmer(); test_api_.reset(new internal::ScreenDimmer::TestApi(dimmer_)); } |