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

Side by Side Diff: ash/shelf/shelf_window_targeter.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/shelf/shelf_window_targeter.h" 5 #include "ash/shelf/shelf_window_targeter.h"
6 6
7 #include "ash/aura/wm_window_aura.h"
8 #include "ash/common/shelf/shelf_constants.h" 7 #include "ash/common/shelf/shelf_constants.h"
9 #include "ash/common/shelf/wm_shelf.h" 8 #include "ash/common/shelf/wm_shelf.h"
10 #include "ash/common/wm_window.h" 9 #include "ash/common/wm_window.h"
11 #include "ash/public/cpp/shelf_types.h" 10 #include "ash/public/cpp/shelf_types.h"
12 11
13 namespace ash { 12 namespace ash {
14 13
15 namespace { 14 namespace {
16 15
17 gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) { 16 gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) {
18 if (alignment == SHELF_ALIGNMENT_LEFT) 17 if (alignment == SHELF_ALIGNMENT_LEFT)
19 return gfx::Insets(0, 0, 0, distance); 18 return gfx::Insets(0, 0, 0, distance);
20 if (alignment == SHELF_ALIGNMENT_RIGHT) 19 if (alignment == SHELF_ALIGNMENT_RIGHT)
21 return gfx::Insets(0, distance, 0, 0); 20 return gfx::Insets(0, distance, 0, 0);
22 return gfx::Insets(distance, 0, 0, 0); 21 return gfx::Insets(distance, 0, 0, 0);
23 } 22 }
24 23
25 } // namespace 24 } // namespace
26 25
27 ShelfWindowTargeter::ShelfWindowTargeter(WmWindow* container, WmShelf* shelf) 26 ShelfWindowTargeter::ShelfWindowTargeter(WmWindow* container, WmShelf* shelf)
28 : ::wm::EasyResizeWindowTargeter(WmWindowAura::GetAuraWindow(container), 27 : ::wm::EasyResizeWindowTargeter(WmWindow::GetAuraWindow(container),
29 gfx::Insets(), 28 gfx::Insets(),
30 gfx::Insets()), 29 gfx::Insets()),
31 shelf_(shelf) { 30 shelf_(shelf) {
32 WillChangeVisibilityState(shelf_->GetVisibilityState()); 31 WillChangeVisibilityState(shelf_->GetVisibilityState());
33 container->AddObserver(this); 32 container->AddObserver(this);
34 shelf_->AddObserver(this); 33 shelf_->AddObserver(this);
35 } 34 }
36 35
37 ShelfWindowTargeter::~ShelfWindowTargeter() { 36 ShelfWindowTargeter::~ShelfWindowTargeter() {
38 // Ensure that the observers were removed and the shelf pointer was cleared. 37 // Ensure that the observers were removed and the shelf pointer was cleared.
(...skipping 20 matching lines...) Expand all
59 // while hidden. 58 // while hidden.
60 touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset, 59 touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset,
61 shelf_->GetAlignment()); 60 shelf_->GetAlignment());
62 } 61 }
63 62
64 set_mouse_extend(mouse_insets); 63 set_mouse_extend(mouse_insets);
65 set_touch_extend(touch_insets); 64 set_touch_extend(touch_insets);
66 } 65 }
67 66
68 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698