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/drag_window_resizer.h" | 5 #include "ash/wm/drag_window_resizer.h" |
6 | 6 |
7 #include "ash/display/mouse_cursor_event_filter.h" | 7 #include "ash/display/mouse_cursor_event_filter.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
12 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
13 #include "ash/test/cursor_manager_test_api.h" | 13 #include "ash/test/cursor_manager_test_api.h" |
14 #include "ash/wm/drag_window_controller.h" | 14 #include "ash/wm/drag_window_controller.h" |
15 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "ui/aura/client/aura_constants.h" | 18 #include "ui/aura/client/aura_constants.h" |
19 #include "ui/aura/root_window.h" | 19 #include "ui/aura/root_window.h" |
20 #include "ui/aura/test/test_window_delegate.h" | 20 #include "ui/aura/test/test_window_delegate.h" |
21 #include "ui/base/hit_test.h" | 21 #include "ui/base/hit_test.h" |
22 #include "ui/base/ui_base_types.h" | 22 #include "ui/base/ui_base_types.h" |
23 #include "ui/gfx/insets.h" | 23 #include "ui/gfx/insets.h" |
24 #include "ui/gfx/screen.h" | 24 #include "ui/gfx/screen.h" |
| 25 #include "ui/views/corewm/window_util.h" |
25 #include "ui/views/widget/widget.h" | 26 #include "ui/views/widget/widget.h" |
26 | 27 |
27 #if defined(OS_CHROMEOS) | 28 #if defined(OS_CHROMEOS) |
28 #include "ash/system/tray/system_tray.h" | 29 #include "ash/system/tray/system_tray.h" |
29 #include "ash/system/user/tray_user.h" | 30 #include "ash/system/user/tray_user.h" |
30 #include "ash/test/test_session_state_delegate.h" | 31 #include "ash/test/test_session_state_delegate.h" |
31 #include "ash/test/test_shell_delegate.h" | 32 #include "ash/test/test_shell_delegate.h" |
32 #endif | 33 #endif |
33 | 34 |
34 namespace ash { | 35 namespace ash { |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 transient_child_ = new aura::Window(&delegate4_); | 78 transient_child_ = new aura::Window(&delegate4_); |
78 transient_child_->SetType(ui::wm::WINDOW_TYPE_NORMAL); | 79 transient_child_->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
79 transient_child_->Init(ui::LAYER_NOT_DRAWN); | 80 transient_child_->Init(ui::LAYER_NOT_DRAWN); |
80 ParentWindowInPrimaryRootWindow(transient_child_); | 81 ParentWindowInPrimaryRootWindow(transient_child_); |
81 transient_child_->set_id(4); | 82 transient_child_->set_id(4); |
82 | 83 |
83 transient_parent_.reset(new aura::Window(&delegate5_)); | 84 transient_parent_.reset(new aura::Window(&delegate5_)); |
84 transient_parent_->SetType(ui::wm::WINDOW_TYPE_NORMAL); | 85 transient_parent_->SetType(ui::wm::WINDOW_TYPE_NORMAL); |
85 transient_parent_->Init(ui::LAYER_NOT_DRAWN); | 86 transient_parent_->Init(ui::LAYER_NOT_DRAWN); |
86 ParentWindowInPrimaryRootWindow(transient_parent_.get()); | 87 ParentWindowInPrimaryRootWindow(transient_parent_.get()); |
87 transient_parent_->AddTransientChild(transient_child_); | 88 views::corewm::AddTransientChild(transient_parent_.get(), transient_child_); |
88 transient_parent_->set_id(5); | 89 transient_parent_->set_id(5); |
89 | 90 |
90 panel_window_.reset(new aura::Window(&delegate6_)); | 91 panel_window_.reset(new aura::Window(&delegate6_)); |
91 panel_window_->SetType(ui::wm::WINDOW_TYPE_PANEL); | 92 panel_window_->SetType(ui::wm::WINDOW_TYPE_PANEL); |
92 panel_window_->Init(ui::LAYER_NOT_DRAWN); | 93 panel_window_->Init(ui::LAYER_NOT_DRAWN); |
93 ParentWindowInPrimaryRootWindow(panel_window_.get()); | 94 ParentWindowInPrimaryRootWindow(panel_window_.get()); |
94 } | 95 } |
95 | 96 |
96 virtual void TearDown() OVERRIDE { | 97 virtual void TearDown() OVERRIDE { |
97 window_.reset(); | 98 window_.reset(); |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 resizer->CompleteDrag(); | 719 resizer->CompleteDrag(); |
719 EXPECT_EQ(1, session_delegate->num_transfer_to_desktop_of_user_calls()); | 720 EXPECT_EQ(1, session_delegate->num_transfer_to_desktop_of_user_calls()); |
720 EXPECT_NE(initial_bounds.ToString(), window->bounds().ToString()); | 721 EXPECT_NE(initial_bounds.ToString(), window->bounds().ToString()); |
721 } | 722 } |
722 } | 723 } |
723 #endif | 724 #endif |
724 | 725 |
725 | 726 |
726 } // namespace internal | 727 } // namespace internal |
727 } // namespace ash | 728 } // namespace ash |
OLD | NEW |