ash/wm/window_util.cc - Issue 10223014: Revert 133982 because it broke build on chromeos due to mid-air collision with 133961.

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_util.cc

Issue 10223014: Revert 133982 because it broke build on chromeos due to mid-air collision with 133961. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: ash/wm/window_util.cc

===================================================================

--- ash/wm/window_util.cc (revision 133983)

+++ ash/wm/window_util.cc (working copy)

@@ -8,9 +8,6 @@

#include "ash/wm/activation_controller.h"

#include "ui/aura/client/activation_client.h"

#include "ui/aura/client/aura_constants.h"

-#include "ui/aura/env.h"

-#include "ui/aura/monitor.h"

-#include "ui/aura/monitor_manager.h"

#include "ui/aura/root_window.h"

#include "ui/aura/window.h"

#include "ui/aura/window_property.h"

@@ -99,13 +96,5 @@

window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);

}

-void CenterWindow(aura::Window* window) {

- const aura::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->

- GetMonitorNearestWindow(window);

- gfx::Rect center = monitor->GetWorkAreaBounds().Center(

- window->bounds().size());

- window->SetBounds(center);

} // namespace wm

} // namespace ash

« no previous file with comments | « ash/wm/window_util.h ('k') | ash/wm/workspace/snap_sizer.h » ('j') | no next file with comments »