ash/common/shelf/shelf_view.cc - Issue 2314853003: Move ash::DisplayManager switches to ui::display

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)

Patch Set: rebased again Created 4 years, 3 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/common/frame/custom_frame_view_ash.cc ('k') | ash/common/shelf/shelf_window_watcher_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/common/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/common/ash_constants.h"

11 #include "ash/common/ash_switches.h"

12 #include "ash/common/drag_drop/drag_image_view.h"	11 #include "ash/common/drag_drop/drag_image_view.h"

13 #include "ash/common/scoped_root_window_for_new_windows.h"	12 #include "ash/common/scoped_root_window_for_new_windows.h"

14 #include "ash/common/shelf/app_list_button.h"	13 #include "ash/common/shelf/app_list_button.h"

15 #include "ash/common/shelf/overflow_bubble.h"	14 #include "ash/common/shelf/overflow_bubble.h"

16 #include "ash/common/shelf/overflow_bubble_view.h"	15 #include "ash/common/shelf/overflow_bubble_view.h"

17 #include "ash/common/shelf/overflow_button.h"	16 #include "ash/common/shelf/overflow_button.h"

18 #include "ash/common/shelf/shelf_button.h"	17 #include "ash/common/shelf/shelf_button.h"

19 #include "ash/common/shelf/shelf_constants.h"	18 #include "ash/common/shelf/shelf_constants.h"

20 #include "ash/common/shelf/shelf_delegate.h"	19 #include "ash/common/shelf/shelf_delegate.h"

21 #include "ash/common/shelf/shelf_menu_model.h"	20 #include "ash/common/shelf/shelf_menu_model.h"

(...skipping 1891 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1913	1912

1914 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {	1913 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {

1915 const gfx::Rect bounds = GetBoundsInScreen();	1914 const gfx::Rect bounds = GetBoundsInScreen();

1916 int distance = wm_shelf_->SelectValueForShelfAlignment(	1915 int distance = wm_shelf_->SelectValueForShelfAlignment(

1917 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),	1916 bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),

1918 bounds.x() - coordinate.x());	1917 bounds.x() - coordinate.x());

1919 return distance > 0 ? distance : 0;	1918 return distance > 0 ? distance : 0;

1920 }	1919 }

1921	1920

1922 } // namespace ash	1921 } // namespace ash

OLD	NEW