ash/wm/panels/attached_panel_window_targeter.cc - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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/wm/panels/attached_panel_window_targeter.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again Created 4 years, 6 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/overview/window_selector.cc ('k') | ash/wm/panels/panel_layout_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/panels/attached_panel_window_targeter.h"	5 #include "ash/wm/panels/attached_panel_window_targeter.h"

6	6

7 #include "ash/aura/wm_shelf_aura.h"	7 #include "ash/aura/wm_shelf_aura.h"

8 #include "ash/common/wm/panels/panel_layout_manager.h"	8 #include "ash/common/wm/panels/panel_layout_manager.h"

9 #include "ash/shelf/shelf.h"	9 #include "ash/shelf/shelf.h"

10 #include "ash/shell.h"	10 #include "ash/shell.h"

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
45	45

46 void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {	46 void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {

47 // Only update the touch insets for panels if they are attached to the shelf	47 // Only update the touch insets for panels if they are attached to the shelf

48 // in \|root_window\|.	48 // in \|root_window\|.

49 if (panel_container_->GetRootWindow() != root_window)	49 if (panel_container_->GetRootWindow() != root_window)

50 return;	50 return;

51	51

52 DCHECK(panel_layout_manager_->shelf());	52 DCHECK(panel_layout_manager_->shelf());

53 gfx::Insets touch(default_touch_extend_);	53 gfx::Insets touch(default_touch_extend_);

54 set_touch_extend(	54 set_touch_extend(

55 wm::WmShelfAura::GetShelf(panel_layout_manager_->shelf())	55 WmShelfAura::GetShelf(panel_layout_manager_->shelf())

56 ->SelectValueForShelfAlignment(	56 ->SelectValueForShelfAlignment(

57 gfx::Insets(touch.top(), touch.left(), 0, touch.right()),	57 gfx::Insets(touch.top(), touch.left(), 0, touch.right()),

58 gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()),	58 gfx::Insets(touch.top(), 0, touch.bottom(), touch.right()),

59 gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0)));	59 gfx::Insets(touch.top(), touch.left(), touch.bottom(), 0)));

60 }	60 }

61	61

62 } // namespace ash	62 } // namespace ash

OLD	NEW