Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Side by Side Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 1913473002: Makes WorkspaceWindowResizer use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@root_controller_observer
Patch Set: fix exo again Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/common/wm_window_tracker.h ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/dock/docked_window_layout_manager.h" 5 #include "ash/wm/dock/docked_window_layout_manager.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf.h" 9 #include "ash/shelf/shelf.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shelf/shelf_model.h" 11 #include "ash/shelf/shelf_model.h"
12 #include "ash/shelf/shelf_types.h" 12 #include "ash/shelf/shelf_types.h"
13 #include "ash/shelf/shelf_widget.h" 13 #include "ash/shelf/shelf_widget.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/shell_window_ids.h" 15 #include "ash/shell_window_ids.h"
16 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
17 #include "ash/test/display_manager_test_api.h" 17 #include "ash/test/display_manager_test_api.h"
18 #include "ash/test/shelf_test_api.h" 18 #include "ash/test/shelf_test_api.h"
19 #include "ash/test/shelf_view_test_api.h" 19 #include "ash/test/shelf_view_test_api.h"
20 #include "ash/test/shell_test_api.h" 20 #include "ash/test/shell_test_api.h"
21 #include "ash/test/test_shelf_delegate.h" 21 #include "ash/test/test_shelf_delegate.h"
22 #include "ash/wm/aura/wm_window_aura.h"
22 #include "ash/wm/panels/panel_layout_manager.h" 23 #include "ash/wm/panels/panel_layout_manager.h"
23 #include "ash/wm/window_resizer.h" 24 #include "ash/wm/window_resizer.h"
24 #include "ash/wm/window_state.h" 25 #include "ash/wm/window_state.h"
25 #include "ash/wm/window_state_aura.h" 26 #include "ash/wm/window_state_aura.h"
26 #include "ash/wm/window_util.h" 27 #include "ash/wm/window_util.h"
27 #include "base/command_line.h" 28 #include "base/command_line.h"
28 #include "base/strings/string_number_conversions.h" 29 #include "base/strings/string_number_conversions.h"
29 #include "ui/aura/client/aura_constants.h" 30 #include "ui/aura/client/aura_constants.h"
30 #include "ui/aura/test/test_window_delegate.h" 31 #include "ui/aura/test/test_window_delegate.h"
31 #include "ui/aura/window.h" 32 #include "ui/aura/window.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 103
103 aura::Window* GetPanelContainer(aura::Window* panel) { 104 aura::Window* GetPanelContainer(aura::Window* panel) {
104 return Shell::GetContainer(panel->GetRootWindow(), 105 return Shell::GetContainer(panel->GetRootWindow(),
105 kShellWindowId_PanelContainer); 106 kShellWindowId_PanelContainer);
106 } 107 }
107 108
108 static WindowResizer* CreateSomeWindowResizer( 109 static WindowResizer* CreateSomeWindowResizer(
109 aura::Window* window, 110 aura::Window* window,
110 const gfx::Point& point_in_parent, 111 const gfx::Point& point_in_parent,
111 int window_component) { 112 int window_component) {
112 return CreateWindowResizer( 113 return CreateWindowResizer(wm::WmWindowAura::Get(window), point_in_parent,
113 window, 114 window_component,
114 point_in_parent, 115 aura::client::WINDOW_MOVE_SOURCE_MOUSE)
115 window_component, 116 .release();
116 aura::client::WINDOW_MOVE_SOURCE_MOUSE).release();
117 } 117 }
118 118
119 void DragStart(aura::Window* window) { 119 void DragStart(aura::Window* window) {
120 DragStartAtOffsetFromwindowOrigin(window, 0, 0); 120 DragStartAtOffsetFromwindowOrigin(window, 0, 0);
121 } 121 }
122 122
123 void DragStartAtOffsetFromwindowOrigin(aura::Window* window, 123 void DragStartAtOffsetFromwindowOrigin(aura::Window* window,
124 int dx, int dy) { 124 int dx, int dy) {
125 initial_location_in_parent_ = 125 initial_location_in_parent_ =
126 window->bounds().origin() + gfx::Vector2d(dx, dy); 126 window->bounds().origin() + gfx::Vector2d(dx, dy);
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); 861 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height());
862 } 862 }
863 863
864 // Tests run twice - on both panels and normal windows 864 // Tests run twice - on both panels and normal windows
865 INSTANTIATE_TEST_CASE_P(NormalOrPanel, 865 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
866 DockedWindowLayoutManagerTest, 866 DockedWindowLayoutManagerTest,
867 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, 867 testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
868 ui::wm::WINDOW_TYPE_PANEL)); 868 ui::wm::WINDOW_TYPE_PANEL));
869 869
870 } // namespace ash 870 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/common/wm_window_tracker.h ('k') | ash/wm/dock/docked_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698