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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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_view.h ('k') | ash/shelf/shelf_view_unittest.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/shelf/shelf_view.h" 5 #include "ash/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/ash_constants.h" 10 #include "ash/ash_constants.h"
11 #include "ash/common/drag_drop/drag_image_view.h" 11 #include "ash/drag_drop/drag_image_view.h"
12 #include "ash/common/scoped_root_window_for_new_windows.h" 12 #include "ash/scoped_root_window_for_new_windows.h"
13 #include "ash/common/shelf/app_list_button.h" 13 #include "ash/shelf/app_list_button.h"
14 #include "ash/common/shelf/overflow_bubble.h" 14 #include "ash/shelf/overflow_bubble.h"
15 #include "ash/common/shelf/overflow_bubble_view.h" 15 #include "ash/shelf/overflow_bubble_view.h"
16 #include "ash/common/shelf/overflow_button.h" 16 #include "ash/shelf/overflow_button.h"
17 #include "ash/common/shelf/shelf_application_menu_model.h" 17 #include "ash/shelf/shelf_application_menu_model.h"
18 #include "ash/common/shelf/shelf_button.h" 18 #include "ash/shelf/shelf_button.h"
19 #include "ash/common/shelf/shelf_constants.h" 19 #include "ash/shelf/shelf_constants.h"
20 #include "ash/common/shelf/shelf_delegate.h" 20 #include "ash/shelf/shelf_delegate.h"
21 #include "ash/common/shelf/shelf_model.h" 21 #include "ash/shelf/shelf_model.h"
22 #include "ash/common/shelf/shelf_widget.h" 22 #include "ash/shelf/shelf_widget.h"
23 #include "ash/common/shelf/wm_shelf.h" 23 #include "ash/shelf/wm_shelf.h"
24 #include "ash/common/shell_delegate.h" 24 #include "ash/shell_delegate.h"
25 #include "ash/common/wm/root_window_finder.h"
26 #include "ash/common/wm_shell.h"
27 #include "ash/common/wm_window.h"
28 #include "ash/strings/grit/ash_strings.h" 25 #include "ash/strings/grit/ash_strings.h"
26 #include "ash/wm/root_window_finder.h"
27 #include "ash/wm_shell.h"
28 #include "ash/wm_window.h"
29 #include "base/auto_reset.h" 29 #include "base/auto_reset.h"
30 #include "base/memory/ptr_util.h" 30 #include "base/memory/ptr_util.h"
31 #include "base/metrics/histogram_macros.h" 31 #include "base/metrics/histogram_macros.h"
32 #include "ui/accessibility/ax_node_data.h" 32 #include "ui/accessibility/ax_node_data.h"
33 #include "ui/base/l10n/l10n_util.h" 33 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/models/simple_menu_model.h" 34 #include "ui/base/models/simple_menu_model.h"
35 #include "ui/compositor/layer.h" 35 #include "ui/compositor/layer.h"
36 #include "ui/compositor/layer_animator.h" 36 #include "ui/compositor/layer_animator.h"
37 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 37 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
38 #include "ui/events/event_utils.h" 38 #include "ui/events/event_utils.h"
(...skipping 1731 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 1770
1771 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const { 1771 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
1772 const gfx::Rect bounds = GetBoundsInScreen(); 1772 const gfx::Rect bounds = GetBoundsInScreen();
1773 int distance = wm_shelf_->SelectValueForShelfAlignment( 1773 int distance = wm_shelf_->SelectValueForShelfAlignment(
1774 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(), 1774 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
1775 bounds.x() - coordinate.x()); 1775 bounds.x() - coordinate.x());
1776 return distance > 0 ? distance : 0; 1776 return distance > 0 ? distance : 0;
1777 } 1777 }
1778 1778
1779 } // namespace ash 1779 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view.h ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698