ash/wm/window_animations.cc - Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell

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

Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (Closed)

Patch Set: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (removed some more wm_window.h) 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/window_animations.cc

diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc

index 388e78cc04c6b8c45e310adef64384af9a18ffd0..62c6e533c6d2796c072aa4c8405dafeba910e144 100644

--- a/ash/wm/window_animations.cc

+++ b/ash/wm/window_animations.cc

@@ -13,7 +13,6 @@

#include "ash/wm/window_animation_types.h"

#include "ash/wm/window_util.h"

#include "ash/wm/workspace_controller.h"

-#include "ash/wm_window.h"

#include "base/i18n/rtl.h"

#include "base/lazy_instance.h"

#include "base/logging.h"

@@ -432,9 +431,8 @@ CreateBrightnessGrayscaleAnimationSequence(float target_value,

}

gfx::Rect GetMinimizeAnimationTargetBoundsInScreen(aura::Window* window) {

- WmWindow* wm_window = WmWindow::Get(window);

Shelf* shelf = Shelf::ForWindow(window);

- gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(wm_window);

+ gfx::Rect item_rect = shelf->GetScreenBoundsOfItemIconForWindow(window);

// The launcher item is visible and has an icon.

if (!item_rect.IsEmpty())

« no previous file with comments | « ash/wm/video_detector.cc ('k') | ash/wm/window_cycle_controller.cc » ('j') | no next file with comments »