| 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 <memory> |    7 #include <memory> | 
|    8  |    8  | 
|    9 #include "ash/common/shelf/shelf_widget.h" |    9 #include "ash/common/shelf/shelf_widget.h" | 
|   10 #include "ash/display/display_util.h" |   10 #include "ash/display/display_util.h" | 
|   11 #include "ash/host/root_window_transformer.h" |   11 #include "ash/host/root_window_transformer.h" | 
|   12 #include "ash/magnifier/magnification_controller.h" |   12 #include "ash/magnifier/magnification_controller.h" | 
|   13 #include "ash/screen_util.h" |   13 #include "ash/screen_util.h" | 
|   14 #include "ash/shell.h" |   14 #include "ash/shell.h" | 
|   15 #include "ash/test/ash_test_base.h" |   15 #include "ash/test/ash_test_base.h" | 
|   16 #include "ash/test/cursor_manager_test_api.h" |   16 #include "ash/test/cursor_manager_test_api.h" | 
|   17 #include "ash/test/mirror_window_test_api.h" |   17 #include "ash/test/mirror_window_test_api.h" | 
|   18 #include "base/synchronization/waitable_event.h" |   18 #include "base/synchronization/waitable_event.h" | 
|   19 #include "ui/aura/env.h" |   19 #include "ui/aura/env.h" | 
|   20 #include "ui/aura/window_event_dispatcher.h" |   20 #include "ui/aura/window_event_dispatcher.h" | 
|   21 #include "ui/aura/window_tracker.h" |   21 #include "ui/aura/window_tracker.h" | 
|   22 #include "ui/display/display.h" |   22 #include "ui/display/display.h" | 
|   23 #include "ui/display/manager/display_layout.h" |   23 #include "ui/display/display_layout.h" | 
|   24 #include "ui/display/manager/display_manager.h" |   24 #include "ui/display/manager/display_manager.h" | 
|   25 #include "ui/display/manager/managed_display_info.h" |   25 #include "ui/display/manager/managed_display_info.h" | 
|   26 #include "ui/display/screen.h" |   26 #include "ui/display/screen.h" | 
|   27 #include "ui/display/test/display_manager_test_api.h" |   27 #include "ui/display/test/display_manager_test_api.h" | 
|   28 #include "ui/events/event_handler.h" |   28 #include "ui/events/event_handler.h" | 
|   29 #include "ui/events/test/event_generator.h" |   29 #include "ui/events/test/event_generator.h" | 
|   30 #include "ui/gfx/geometry/rect_conversions.h" |   30 #include "ui/gfx/geometry/rect_conversions.h" | 
|   31 #include "ui/views/widget/widget.h" |   31 #include "ui/views/widget/widget.h" | 
|   32  |   32  | 
|   33 namespace ash { |   33 namespace ash { | 
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  433   // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125. |  433   // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125. | 
|  434   EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); |  434   EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString()); | 
|  435  |  435  | 
|  436   UpdateDisplay("200x400,500x500"); |  436   UpdateDisplay("200x400,500x500"); | 
|  437   // The aspect ratio is flipped, so X margin is now 125. |  437   // The aspect ratio is flipped, so X margin is now 125. | 
|  438   transformer = CreateCurrentRootWindowTransformerForMirroring(); |  438   transformer = CreateCurrentRootWindowTransformerForMirroring(); | 
|  439   EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); |  439   EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString()); | 
|  440 } |  440 } | 
|  441  |  441  | 
|  442 }  // namespace ash |  442 }  // namespace ash | 
| OLD | NEW |