OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/wm/panels/panel_window_resizer.h" | 5 #include "ash/wm/panels/panel_window_resizer.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 location.set_x(location.x() + delta_x); | 57 location.set_x(location.x() + delta_x); |
58 location.set_y(location.y() + delta_y); | 58 location.set_y(location.y() + delta_y); |
59 return location; | 59 return location; |
60 } | 60 } |
61 | 61 |
62 aura::Window* CreatePanelWindow(const gfx::Point& origin) { | 62 aura::Window* CreatePanelWindow(const gfx::Point& origin) { |
63 gfx::Rect bounds(origin, gfx::Size(101, 101)); | 63 gfx::Rect bounds(origin, gfx::Size(101, 101)); |
64 aura::Window* window = CreateTestWindowInShellWithDelegateAndType( | 64 aura::Window* window = CreateTestWindowInShellWithDelegateAndType( |
65 NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds); | 65 NULL, ui::wm::WINDOW_TYPE_PANEL, 0, bounds); |
66 shelf_delegate_->AddShelfItem(window); | 66 shelf_delegate_->AddShelfItem(window); |
67 PanelLayoutManager* manager = static_cast<PanelLayoutManager*>( | |
68 Shell::GetContainer(window->GetRootWindow(), | |
69 kShellWindowId_PanelContainer)->layout_manager()); | |
70 manager->Relayout(); | |
71 return window; | 67 return window; |
72 } | 68 } |
73 | 69 |
74 void DragStart(aura::Window* window) { | 70 void DragStart(aura::Window* window) { |
75 resizer_.reset(CreateWindowResizer( | 71 resizer_.reset(CreateWindowResizer( |
76 window, | 72 window, |
77 window->bounds().origin(), | 73 window->bounds().origin(), |
78 HTCAPTION, | 74 HTCAPTION, |
79 aura::client::WINDOW_MOVE_SOURCE_MOUSE).release()); | 75 aura::client::WINDOW_MOVE_SOURCE_MOUSE).release()); |
80 ASSERT_TRUE(resizer_.get()); | 76 ASSERT_TRUE(resizer_.get()); |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 | 554 |
559 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, | 555 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, |
560 testing::Bool()); | 556 testing::Bool()); |
561 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, | 557 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, |
562 PanelWindowResizerTransientTest, | 558 PanelWindowResizerTransientTest, |
563 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 559 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
564 ui::wm::WINDOW_TYPE_PANEL, | 560 ui::wm::WINDOW_TYPE_PANEL, |
565 ui::wm::WINDOW_TYPE_POPUP)); | 561 ui::wm::WINDOW_TYPE_POPUP)); |
566 | 562 |
567 } // namespace ash | 563 } // namespace ash |
OLD | NEW |