| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/wm/root_window_finder.h" | |
| 6 #include "ash/common/wm_window.h" | |
| 7 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/wm/root_window_finder.h" |
| 8 #include "ash/wm/window_properties.h" | 7 #include "ash/wm/window_properties.h" |
| 8 #include "ash/wm_window.h" |
| 9 #include "ui/aura/client/capture_client.h" | 9 #include "ui/aura/client/capture_client.h" |
| 10 #include "ui/aura/client/screen_position_client.h" | 10 #include "ui/aura/client/screen_position_client.h" |
| 11 #include "ui/aura/env.h" | 11 #include "ui/aura/env.h" |
| 12 #include "ui/aura/test/ui_controls_factory_aura.h" | 12 #include "ui/aura/test/ui_controls_factory_aura.h" |
| 13 #include "ui/aura/window_tree_host.h" | 13 #include "ui/aura/window_tree_host.h" |
| 14 #include "ui/base/class_property.h" | 14 #include "ui/base/class_property.h" |
| 15 #include "ui/base/test/ui_controls.h" | 15 #include "ui/base/test/ui_controls.h" |
| 16 #include "ui/base/test/ui_controls_aura.h" | 16 #include "ui/base/test/ui_controls_aura.h" |
| 17 #include "ui/display/screen.h" | 17 #include "ui/display/screen.h" |
| 18 | 18 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 private: | 128 private: |
| 129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); | 129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); |
| 130 }; | 130 }; |
| 131 | 131 |
| 132 ui_controls::UIControlsAura* CreateAshUIControls() { | 132 ui_controls::UIControlsAura* CreateAshUIControls() { |
| 133 return new ash::test::UIControlsAsh(); | 133 return new ash::test::UIControlsAsh(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace test | 136 } // namespace test |
| 137 } // namespace ash | 137 } // namespace ash |
| OLD | NEW |