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/display/root_window_transformers.h" | 5 #include "ash/display/root_window_transformers.h" |
6 | 6 |
7 #include "ash/display/display_info.h" | 7 #include "ash/display/display_info.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/launcher/launcher.h" | 9 #include "ash/launcher/launcher.h" |
10 #include "ash/magnifier/magnification_controller.h" | 10 #include "ash/magnifier/magnification_controller.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 float touch_radius_x() const { return touch_radius_x_; } | 90 float touch_radius_x() const { return touch_radius_x_; } |
91 float touch_radius_y() const { return touch_radius_y_; } | 91 float touch_radius_y() const { return touch_radius_y_; } |
92 float scroll_x_offset() const { return scroll_x_offset_; } | 92 float scroll_x_offset() const { return scroll_x_offset_; } |
93 float scroll_y_offset() const { return scroll_y_offset_; } | 93 float scroll_y_offset() const { return scroll_y_offset_; } |
94 float scroll_x_offset_ordinal() const { return scroll_x_offset_ordinal_; } | 94 float scroll_x_offset_ordinal() const { return scroll_x_offset_ordinal_; } |
95 float scroll_y_offset_ordinal() const { return scroll_y_offset_ordinal_; } | 95 float scroll_y_offset_ordinal() const { return scroll_y_offset_ordinal_; } |
96 | 96 |
97 private: | 97 private: |
98 gfx::Point mouse_location_; | 98 gfx::Point mouse_location_; |
99 aura::RootWindow* target_root_; | 99 aura::Window* target_root_; |
100 | 100 |
101 float touch_radius_x_; | 101 float touch_radius_x_; |
102 float touch_radius_y_; | 102 float touch_radius_y_; |
103 float scroll_x_offset_; | 103 float scroll_x_offset_; |
104 float scroll_y_offset_; | 104 float scroll_y_offset_; |
105 float scroll_x_offset_ordinal_; | 105 float scroll_x_offset_ordinal_; |
106 float scroll_y_offset_ordinal_; | 106 float scroll_y_offset_ordinal_; |
107 | 107 |
108 DISALLOW_COPY_AND_ASSIGN(TestEventHandler); | 108 DISALLOW_COPY_AND_ASSIGN(TestEventHandler); |
109 }; | 109 }; |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); | 404 EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); |
405 | 405 |
406 UpdateDisplay("200x400,500x500"); | 406 UpdateDisplay("200x400,500x500"); |
407 // The aspect ratio is flipped, so X margin is now 125. | 407 // The aspect ratio is flipped, so X margin is now 125. |
408 transformer = test_api.CreateCurrentRootWindowTransformer(); | 408 transformer = test_api.CreateCurrentRootWindowTransformer(); |
409 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); | 409 EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); |
410 } | 410 } |
411 | 411 |
412 } // namespace test | 412 } // namespace test |
413 } // namespace ash | 413 } // namespace ash |
OLD | NEW |