ash/wm/panels/panel_window_resizer.cc - Issue 12313118: Refactor: Shelf Widget

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/panel_window_resizer.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: safer shutdown (status_area_widget_) Created 7 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:

Index: ash/wm/panels/panel_window_resizer.cc

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

index 0f82db56b41dfb4e1b4252a1e0e4d61cf47bb912..e306f29411bcc3ba85c4bc4ef58639947c21a03c 100644

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

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

@@ -6,7 +6,8 @@

#include "ash/launcher/launcher.h"

#include "ash/root_window_controller.h"

-#include "ash/shelf_types.h"

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

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

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

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

@@ -102,8 +103,8 @@ PanelWindowResizer::PanelWindowResizer(const Details& details)

bool PanelWindowResizer::AttachToLauncher(gfx::Rect* bounds) {

bool should_attach = false;

if (panel_layout_manager_) {

- gfx::Rect launcher_bounds = panel_layout_manager_->launcher()->widget()->

- GetWindowBoundsInScreen();

+ gfx::Rect launcher_bounds = panel_layout_manager_->launcher()->

+ shelf_widget()->GetWindowBoundsInScreen();

switch (panel_layout_manager_->launcher()->alignment()) {

case SHELF_ALIGNMENT_BOTTOM:

if (bounds->bottom() >= (launcher_bounds.y() -