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

Side by Side Diff: ash/common/wm/panels/panel_window_resizer.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 9 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/common/wm/panels/panel_layout_manager.cc ('k') | ash/common/wm/root_window_finder.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) 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/panels/panel_window_resizer.h" 5 #include "ash/common/wm/panels/panel_window_resizer.h"
6 6
7 #include "ash/common/shelf/wm_shelf.h" 7 #include "ash/common/shelf/wm_shelf.h"
8 #include "ash/common/wm/panels/panel_layout_manager.h" 8 #include "ash/common/wm/panels/panel_layout_manager.h"
9 #include "ash/common/wm/window_parenting_utils.h" 9 #include "ash/common/wm/window_parenting_utils.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
11 #include "ash/common/wm_lookup.h"
12 #include "ash/common/wm_window.h" 11 #include "ash/common/wm_window.h"
13 #include "ash/common/wm_window_property.h" 12 #include "ash/common/wm_window_property.h"
14 #include "ash/public/cpp/shell_window_ids.h" 13 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/root_window_controller.h" 14 #include "ash/root_window_controller.h"
15 #include "ash/shell.h"
16 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
17 #include "ui/base/ui_base_types.h" 17 #include "ui/base/ui_base_types.h"
18 #include "ui/display/display.h" 18 #include "ui/display/display.h"
19 #include "ui/display/screen.h" 19 #include "ui/display/screen.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
23 namespace { 23 namespace {
24 24
25 const int kPanelSnapToLauncherDistance = 30; 25 const int kPanelSnapToLauncherDistance = 30;
(...skipping 23 matching lines...) Expand all
49 if (dst_display.id() != 49 if (dst_display.id() !=
50 panel_container_->GetRootWindow()->GetDisplayNearestWindow().id()) { 50 panel_container_->GetRootWindow()->GetDisplayNearestWindow().id()) {
51 // The panel is being dragged to a new display. If the previous container is 51 // The panel is being dragged to a new display. If the previous container is
52 // the current parent of the panel it will be informed of the end of drag 52 // the current parent of the panel it will be informed of the end of drag
53 // when the panel is reparented, otherwise let the previous container know 53 // when the panel is reparented, otherwise let the previous container know
54 // the drag is complete. If we told the panel's parent that the drag was 54 // the drag is complete. If we told the panel's parent that the drag was
55 // complete it would begin positioning the panel. 55 // complete it would begin positioning the panel.
56 if (GetTarget()->GetParent() != panel_container_) 56 if (GetTarget()->GetParent() != panel_container_)
57 PanelLayoutManager::Get(panel_container_)->FinishDragging(); 57 PanelLayoutManager::Get(panel_container_)->FinishDragging();
58 WmWindow* dst_root = 58 WmWindow* dst_root =
59 WmLookup::Get() 59 Shell::GetRootWindowControllerWithDisplayId(dst_display.id())
60 ->GetRootWindowControllerWithDisplayId(dst_display.id())
61 ->GetWindow(); 60 ->GetWindow();
62 panel_container_ = 61 panel_container_ =
63 dst_root->GetChildByShellWindowId(kShellWindowId_PanelContainer); 62 dst_root->GetChildByShellWindowId(kShellWindowId_PanelContainer);
64 63
65 // The panel's parent already knows that the drag is in progress for this 64 // The panel's parent already knows that the drag is in progress for this
66 // panel. 65 // panel.
67 if (panel_container_ && GetTarget()->GetParent() != panel_container_) 66 if (panel_container_ && GetTarget()->GetParent() != panel_container_)
68 PanelLayoutManager::Get(panel_container_)->StartDragging(GetTarget()); 67 PanelLayoutManager::Get(panel_container_)->StartDragging(GetTarget());
69 } 68 }
70 gfx::Point offset; 69 gfx::Point offset;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 199
201 void PanelWindowResizer::UpdateLauncherPosition() { 200 void PanelWindowResizer::UpdateLauncherPosition() {
202 if (panel_container_) { 201 if (panel_container_) {
203 PanelLayoutManager::Get(panel_container_) 202 PanelLayoutManager::Get(panel_container_)
204 ->shelf() 203 ->shelf()
205 ->UpdateIconPositionForPanel(GetTarget()); 204 ->UpdateIconPositionForPanel(GetTarget());
206 } 205 }
207 } 206 }
208 207
209 } // namespace ash 208 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/panels/panel_layout_manager.cc ('k') | ash/common/wm/root_window_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698