| 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 "ash/wm/dim_window.h" | 10 #include "ash/wm/dim_window.h" |
| 11 #include "base/basictypes.h" | |
| 12 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 13 //#include "ui/aura/window_event_dispatcher.h" | 12 //#include "ui/aura/window_event_dispatcher.h" |
| 14 #include "ui/aura/test/test_windows.h" | 13 #include "ui/aura/test/test_windows.h" |
| 15 #include "ui/compositor/layer.h" | 14 #include "ui/compositor/layer.h" |
| 16 | 15 |
| 17 namespace ash { | 16 namespace ash { |
| 18 namespace test { | 17 namespace test { |
| 19 | 18 |
| 20 class ScreenDimmerTest : public AshTestBase { | 19 class ScreenDimmerTest : public AshTestBase { |
| 21 public: | 20 public: |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 | 105 |
| 107 dim_iter = std::find(root_window->children().begin(), | 106 dim_iter = std::find(root_window->children().begin(), |
| 108 root_window->children().end(), GetDimWindow()); | 107 root_window->children().end(), GetDimWindow()); |
| 109 ASSERT_TRUE(dim_iter != root_window->children().end()); | 108 ASSERT_TRUE(dim_iter != root_window->children().end()); |
| 110 // Dom layer is at the bottom. | 109 // Dom layer is at the bottom. |
| 111 EXPECT_EQ(*dim_iter, *root_window->children().begin()); | 110 EXPECT_EQ(*dim_iter, *root_window->children().begin()); |
| 112 } | 111 } |
| 113 | 112 |
| 114 } // namespace test | 113 } // namespace test |
| 115 } // namespace ash | 114 } // namespace ash |
| OLD | NEW |