OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/wm/screen_dimmer.h" | 5 #include "ash/wm/screen_dimmer.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 dimmer_->SetDimming(true); | 64 dimmer_->SetDimming(true); |
65 ui::Layer* dimming_layer = test_api_->layer(); | 65 ui::Layer* dimming_layer = test_api_->layer(); |
66 ASSERT_TRUE(dimming_layer != NULL); | 66 ASSERT_TRUE(dimming_layer != NULL); |
67 ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer(); | 67 ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer(); |
68 EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(), | 68 EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(), |
69 dimming_layer->bounds().ToString()); | 69 dimming_layer->bounds().ToString()); |
70 | 70 |
71 // When we resize the root window, the dimming layer should be resized to | 71 // When we resize the root window, the dimming layer should be resized to |
72 // match. | 72 // match. |
73 gfx::Rect kNewBounds(400, 300); | 73 gfx::Rect kNewBounds(400, 300); |
74 Shell::GetPrimaryRootWindow()->GetDispatcher()->host()->SetBounds(kNewBounds); | 74 Shell::GetPrimaryRootWindow()->GetHost()->SetBounds(kNewBounds); |
75 EXPECT_EQ(kNewBounds.ToString(), dimming_layer->bounds().ToString()); | 75 EXPECT_EQ(kNewBounds.ToString(), dimming_layer->bounds().ToString()); |
76 } | 76 } |
77 | 77 |
78 } // namespace test | 78 } // namespace test |
79 } // namespace ash | 79 } // namespace ash |
OLD | NEW |