OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/magnifier/magnification_controller.h" | 5 #include "ash/magnifier/magnification_controller.h" |
6 | 6 |
| 7 #include "ash/common/accessibility_types.h" |
7 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
10 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
11 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
12 #include "ui/aura/test/aura_test_utils.h" | 13 #include "ui/aura/test/aura_test_utils.h" |
13 #include "ui/aura/window_tree_host.h" | 14 #include "ui/aura/window_tree_host.h" |
14 #include "ui/base/ime/input_method.h" | 15 #include "ui/base/ime/input_method.h" |
15 #include "ui/chromeos/accessibility_types.h" | |
16 #include "ui/display/screen.h" | 16 #include "ui/display/screen.h" |
17 #include "ui/events/test/event_generator.h" | 17 #include "ui/events/test/event_generator.h" |
18 #include "ui/gfx/geometry/rect_conversions.h" | 18 #include "ui/gfx/geometry/rect_conversions.h" |
19 #include "ui/views/controls/textfield/textfield.h" | 19 #include "ui/views/controls/textfield/textfield.h" |
20 #include "ui/views/layout/fill_layout.h" | 20 #include "ui/views/layout/fill_layout.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 #include "ui/views/widget/widget_delegate.h" | 22 #include "ui/views/widget/widget_delegate.h" |
23 #include "ui/wm/core/coordinate_conversion.h" | 23 #include "ui/wm/core/coordinate_conversion.h" |
24 | 24 |
25 namespace ash { | 25 namespace ash { |
(...skipping 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
710 UpdateDisplay("500x500"); | 710 UpdateDisplay("500x500"); |
711 EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString()); | 711 EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString()); |
712 EXPECT_EQ(2.0f, GetMagnificationController()->GetScale()); | 712 EXPECT_EQ(2.0f, GetMagnificationController()->GetScale()); |
713 | 713 |
714 GetMagnificationController()->SetEnabled(false); | 714 GetMagnificationController()->SetEnabled(false); |
715 EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString()); | 715 EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString()); |
716 EXPECT_EQ(1.0f, GetMagnificationController()->GetScale()); | 716 EXPECT_EQ(1.0f, GetMagnificationController()->GetScale()); |
717 } | 717 } |
718 | 718 |
719 } // namespace ash | 719 } // namespace ash |
OLD | NEW |