| 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/common/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/common/wm/workspace/workspace_layout_manager.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "ash/common/wm/fullscreen_window_finder.h" | 10 #include "ash/common/wm/fullscreen_window_finder.h" |
| 11 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
| 12 #include "ash/common/wm/wm_event.h" | 12 #include "ash/common/wm/wm_event.h" |
| 13 #include "ash/common/wm/wm_screen_util.h" | 13 #include "ash/common/wm/wm_screen_util.h" |
| 14 #include "ash/common/wm_root_window_controller_observer.h" | 14 #include "ash/common/wm_root_window_controller_observer.h" |
| 15 #include "ash/mus/bridge/wm_root_window_controller_mus.h" | 15 #include "ash/mus/bridge/wm_root_window_controller_mus.h" |
| 16 #include "ash/mus/bridge/wm_window_mus.h" | 16 #include "ash/mus/bridge/wm_window_mus.h" |
| 17 #include "ash/mus/test/wm_test_base.h" | 17 #include "ash/mus/test/wm_test_base.h" |
| 18 #include "base/run_loop.h" | 18 #include "base/run_loop.h" |
| 19 #include "components/mus/public/cpp/tests/test_window.h" | 19 #include "services/ui/public/cpp/tests/test_window.h" |
| 20 #include "ui/display/display.h" | 20 #include "ui/display/display.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace mus { | 23 namespace mus { |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 // TODO(sky): no tests for multiple displays yet: http://crbug.com/612627. | 26 // TODO(sky): no tests for multiple displays yet: http://crbug.com/612627. |
| 27 /* | 27 /* |
| 28 class MaximizeDelegateView : public views::WidgetDelegateView { | 28 class MaximizeDelegateView : public views::WidgetDelegateView { |
| 29 public: | 29 public: |
| (...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1095 occluded_window_bounds.width(), | 1095 occluded_window_bounds.width(), |
| 1096 occluded_window_bounds.height()).ToString(), | 1096 occluded_window_bounds.height()).ToString(), |
| 1097 window->bounds().ToString()); | 1097 window->bounds().ToString()); |
| 1098 HideKeyboard(); | 1098 HideKeyboard(); |
| 1099 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); | 1099 EXPECT_EQ(occluded_window_bounds.ToString(), window->bounds().ToString()); |
| 1100 } | 1100 } |
| 1101 */ | 1101 */ |
| 1102 | 1102 |
| 1103 } // namespace mus | 1103 } // namespace mus |
| 1104 } // namespace ash | 1104 } // namespace ash |
| OLD | NEW |