diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:34:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 09:34:56 +0000 |
| commit | d90b839ad378031602d5dbdf846c58994d451403 (patch) | |
| tree | 013c72c390c7a7e4e9cb76f03a6c9eb29c7d68a2 /ash/wm/screen_dimmer_unittest.cc | |
| parent | 7bc8299dccc300184e850e1a76db110a85234db1 (diff) | |
| download | chromium_src-d90b839ad378031602d5dbdf846c58994d451403.zip chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.gz chromium_src-d90b839ad378031602d5dbdf846c58994d451403.tar.bz2 | |
Reland r141871.
Add RootWindowController that keeps per root window state.
Cleanup Shell::Init(). Separated initialization that are specific to shell, root window and primary display.
I also did small cleanup in detor. I'll do more cleanups when I have a chance.
BUG=123160
TEST=no functional change. all tests should pass.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=141871
Review URL: https://chromiumcodereview.appspot.com/10546024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141881 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, 2 insertions, 1 deletions
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index ecc6cd5..2c40e33 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_)); } |