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

Side by Side Diff: ash/common/wm/dock/docked_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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/common/wm/dock/docked_window_resizer.h" 5 #include "ash/common/wm/dock/docked_window_resizer.h"
6 6
7 #include "ash/common/wm/dock/docked_window_layout_manager.h" 7 #include "ash/common/wm/dock/docked_window_layout_manager.h"
8 #include "ash/common/wm/window_parenting_utils.h" 8 #include "ash/common/wm/window_parenting_utils.h"
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/common/wm/wm_event.h" 10 #include "ash/common/wm/wm_event.h"
11 #include "ash/common/wm/workspace/magnetism_matcher.h" 11 #include "ash/common/wm/workspace/magnetism_matcher.h"
12 #include "ash/common/wm_lookup.h"
13 #include "ash/common/wm_window.h" 12 #include "ash/common/wm_window.h"
14 #include "ash/common/wm_window_property.h" 13 #include "ash/common/wm_window_property.h"
15 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
16 #include "ash/root_window_controller.h" 15 #include "ash/root_window_controller.h"
16 #include "ash/shell.h"
17 #include "ui/base/hit_test.h" 17 #include "ui/base/hit_test.h"
18 #include "ui/base/ui_base_types.h" 18 #include "ui/base/ui_base_types.h"
19 #include "ui/display/display.h" 19 #include "ui/display/display.h"
20 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
21 21
22 namespace ash { 22 namespace ash {
23 namespace { 23 namespace {
24 24
25 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint( 25 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint(
26 const gfx::Point& point) { 26 const gfx::Point& point) {
27 display::Display display = 27 display::Display display =
28 display::Screen::GetScreen()->GetDisplayNearestPoint(point); 28 display::Screen::GetScreen()->GetDisplayNearestPoint(point);
29 if (!display.bounds().Contains(point)) 29 if (!display.bounds().Contains(point))
30 return nullptr; 30 return nullptr;
31 31
32 return DockedWindowLayoutManager::Get( 32 return DockedWindowLayoutManager::Get(
33 WmLookup::Get() 33 Shell::GetRootWindowControllerWithDisplayId(display.id())->GetWindow());
34 ->GetRootWindowControllerWithDisplayId(display.id())
35 ->GetWindow());
36 } 34 }
37 35
38 } // namespace 36 } // namespace
39 37
40 DockedWindowResizer::~DockedWindowResizer() {} 38 DockedWindowResizer::~DockedWindowResizer() {}
41 39
42 // static 40 // static
43 DockedWindowResizer* DockedWindowResizer::Create( 41 DockedWindowResizer* DockedWindowResizer::Create(
44 WindowResizer* next_window_resizer, 42 WindowResizer* next_window_resizer,
45 wm::WindowState* window_state) { 43 wm::WindowState* window_state) {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 } else if (window->GetWindowState()->IsDocked() && 315 } else if (window->GetWindowState()->IsDocked() &&
318 action == DOCKED_ACTION_UNDOCK) { 316 action == DOCKED_ACTION_UNDOCK) {
319 const wm::WMEvent event(wm::WM_EVENT_NORMAL); 317 const wm::WMEvent event(wm::WM_EVENT_NORMAL);
320 window_state_->OnWMEvent(&event); 318 window_state_->OnWMEvent(&event);
321 } 319 }
322 320
323 return action; 321 return action;
324 } 322 }
325 323
326 } // namespace ash 324 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/dock/docked_window_layout_manager.cc ('k') | ash/common/wm/immersive_context_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698