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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_window_watcher.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/common/wm_window.h"
7 #include "ash/public/cpp/shelf_types.h" 8 #include "ash/public/cpp/shelf_types.h"
8 #include "ash/shelf/shelf_constants.h" 9 #include "ash/shelf/shelf_constants.h"
9 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
10 #include "ash/wm_window.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 namespace { 15 namespace {
16 16
17 gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) { 17 gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) {
18 if (alignment == SHELF_ALIGNMENT_LEFT) 18 if (alignment == SHELF_ALIGNMENT_LEFT)
19 return gfx::Insets(0, 0, 0, distance); 19 return gfx::Insets(0, 0, 0, distance);
20 if (alignment == SHELF_ALIGNMENT_RIGHT) 20 if (alignment == SHELF_ALIGNMENT_RIGHT)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // while hidden. 59 // while hidden.
60 touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset, 60 touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset,
61 shelf_->GetAlignment()); 61 shelf_->GetAlignment());
62 } 62 }
63 63
64 set_mouse_extend(mouse_insets); 64 set_mouse_extend(mouse_insets);
65 set_touch_extend(touch_insets); 65 set_touch_extend(touch_insets);
66 } 66 }
67 67
68 } // namespace ash 68 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698