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

Side by Side Diff: ash/wm/common/dock/docked_window_resizer.cc

Issue 1943603002: Makes ash/wm/common a library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 7 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/dock/docked_window_resizer.h ('k') | ash/wm/common/drag_details.h » ('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 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/wm/common/dock/docked_window_resizer.h" 5 #include "ash/wm/common/dock/docked_window_resizer.h"
6 6
7 #include "ash/wm/common/dock/docked_window_layout_manager.h" 7 #include "ash/wm/common/dock/docked_window_layout_manager.h"
8 #include "ash/wm/common/window_parenting_utils.h" 8 #include "ash/wm/common/window_parenting_utils.h"
9 #include "ash/wm/common/window_state.h" 9 #include "ash/wm/common/window_state.h"
10 #include "ash/wm/common/wm_event.h" 10 #include "ash/wm/common/wm_event.h"
11 #include "ash/wm/common/wm_lookup.h"
11 #include "ash/wm/common/wm_root_window_controller.h" 12 #include "ash/wm/common/wm_root_window_controller.h"
12 #include "ash/wm/common/wm_shell_window_ids.h" 13 #include "ash/wm/common/wm_shell_window_ids.h"
13 #include "ash/wm/common/wm_window.h" 14 #include "ash/wm/common/wm_window.h"
14 #include "ash/wm/common/workspace/magnetism_matcher.h" 15 #include "ash/wm/common/workspace/magnetism_matcher.h"
15 #include "ui/base/hit_test.h" 16 #include "ui/base/hit_test.h"
16 #include "ui/base/ui_base_types.h" 17 #include "ui/base/ui_base_types.h"
17 #include "ui/display/screen.h" 18 #include "ui/display/screen.h"
18 19
19 namespace ash { 20 namespace ash {
20 namespace { 21 namespace {
21 22
22 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint( 23 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint(
23 const gfx::Point& point) { 24 const gfx::Point& point) {
24 display::Display display = 25 display::Display display =
25 display::Screen::GetScreen()->GetDisplayNearestPoint(point); 26 display::Screen::GetScreen()->GetDisplayNearestPoint(point);
26 if (!display.bounds().Contains(point)) 27 if (!display.bounds().Contains(point))
27 return nullptr; 28 return nullptr;
28 29
29 return DockedWindowLayoutManager::Get( 30 return DockedWindowLayoutManager::Get(
30 wm::WmRootWindowController::GetWithDisplayId(display.id())->GetWindow()); 31 wm::WmLookup::Get()
32 ->GetRootWindowControllerWithDisplayId(display.id())
33 ->GetWindow());
31 } 34 }
32 35
33 } // namespace 36 } // namespace
34 37
35 DockedWindowResizer::~DockedWindowResizer() {} 38 DockedWindowResizer::~DockedWindowResizer() {}
36 39
37 // static 40 // static
38 DockedWindowResizer* DockedWindowResizer::Create( 41 DockedWindowResizer* DockedWindowResizer::Create(
39 WindowResizer* next_window_resizer, 42 WindowResizer* next_window_resizer,
40 wm::WindowState* window_state) { 43 wm::WindowState* window_state) {
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } else if (window->GetWindowState()->IsDocked() && 316 } else if (window->GetWindowState()->IsDocked() &&
314 action == DOCKED_ACTION_UNDOCK) { 317 action == DOCKED_ACTION_UNDOCK) {
315 const wm::WMEvent event(wm::WM_EVENT_NORMAL); 318 const wm::WMEvent event(wm::WM_EVENT_NORMAL);
316 window_state_->OnWMEvent(&event); 319 window_state_->OnWMEvent(&event);
317 } 320 }
318 321
319 return action; 322 return action;
320 } 323 }
321 324
322 } // namespace ash 325 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/common/dock/docked_window_resizer.h ('k') | ash/wm/common/drag_details.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698