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/wm/workspace/workspace_layout_manager.h" | 5 #include "ash/wm/workspace/workspace_layout_manager.h" |
6 | 6 |
7 #include "ash/display/display_layout.h" | 7 #include "ash/display/display_layout.h" |
8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "ash/wm/workspace/workspace_window_resizer.h" | 21 #include "ash/wm/workspace/workspace_window_resizer.h" |
22 #include "base/basictypes.h" | 22 #include "base/basictypes.h" |
23 #include "base/compiler_specific.h" | 23 #include "base/compiler_specific.h" |
24 #include "ui/aura/client/aura_constants.h" | 24 #include "ui/aura/client/aura_constants.h" |
25 #include "ui/aura/test/test_windows.h" | 25 #include "ui/aura/test/test_windows.h" |
26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
27 #include "ui/aura/window_event_dispatcher.h" | 27 #include "ui/aura/window_event_dispatcher.h" |
28 #include "ui/base/ui_base_types.h" | 28 #include "ui/base/ui_base_types.h" |
29 #include "ui/gfx/insets.h" | 29 #include "ui/gfx/insets.h" |
30 #include "ui/gfx/screen.h" | 30 #include "ui/gfx/screen.h" |
31 #include "ui/views/corewm/window_util.h" | |
32 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
33 #include "ui/views/widget/widget_delegate.h" | 32 #include "ui/views/widget/widget_delegate.h" |
| 33 #include "ui/wm/core/window_util.h" |
34 | 34 |
35 namespace ash { | 35 namespace ash { |
36 namespace { | 36 namespace { |
37 | 37 |
38 class MaximizeDelegateView : public views::WidgetDelegateView { | 38 class MaximizeDelegateView : public views::WidgetDelegateView { |
39 public: | 39 public: |
40 MaximizeDelegateView(const gfx::Rect& initial_bounds) | 40 MaximizeDelegateView(const gfx::Rect& initial_bounds) |
41 : initial_bounds_(initial_bounds) { | 41 : initial_bounds_(initial_bounds) { |
42 } | 42 } |
43 virtual ~MaximizeDelegateView() {} | 43 virtual ~MaximizeDelegateView() {} |
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
940 EXPECT_EQ("b,x", | 940 EXPECT_EQ("b,x", |
941 GetWindowOrderAsString(backdrop, window1.get(), window2.get(), | 941 GetWindowOrderAsString(backdrop, window1.get(), window2.get(), |
942 window3.get())); | 942 window3.get())); |
943 ShowTopWindowBackdrop(false); | 943 ShowTopWindowBackdrop(false); |
944 EXPECT_EQ("b", | 944 EXPECT_EQ("b", |
945 GetWindowOrderAsString(NULL, window1.get(), window2.get(), | 945 GetWindowOrderAsString(NULL, window1.get(), window2.get(), |
946 window3.get())); | 946 window3.get())); |
947 } | 947 } |
948 | 948 |
949 } // namespace ash | 949 } // namespace ash |
OLD | NEW |