ash/wm/panels/attached_panel_window_targeter.cc - Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf

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

Unified Diff: ash/wm/panels/attached_panel_window_targeter.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)

Patch Set: rebase Created 3 years, 7 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:

Index: ash/wm/panels/attached_panel_window_targeter.cc

diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc

index 5bb9ba586a163c7ae91747d5bfabad1938543c81..cec18dd2b2ec61fe0963040b20e8efe8bcb38b68 100644

--- a/ash/wm/panels/attached_panel_window_targeter.cc

+++ b/ash/wm/panels/attached_panel_window_targeter.cc

@@ -4,7 +4,7 @@

#include "ash/wm/panels/attached_panel_window_targeter.h"

-#include "ash/shelf/wm_shelf.h"

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

#include "ash/shell.h"

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

#include "ash/wm_window.h"

@@ -52,7 +52,7 @@ void AttachedPanelWindowTargeter::UpdateTouchExtend(aura::Window* root_window) {

DCHECK(panel_layout_manager_->shelf());

gfx::Insets touch(default_touch_extend_);

- switch (panel_layout_manager_->shelf()->GetAlignment()) {

+ switch (panel_layout_manager_->shelf()->alignment()) {

case SHELF_ALIGNMENT_BOTTOM:

case SHELF_ALIGNMENT_BOTTOM_LOCKED:

set_touch_extend(

« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »