| Index: ash/wm/window_util.cc
|
| diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
|
| index a20693a54e68f0fc69f899d5aa81886a80bf8df1..32e0b1e8c768a7adb8eeba3b0f1655c0a0e136a9 100644
|
| --- a/ash/wm/window_util.cc
|
| +++ b/ash/wm/window_util.cc
|
| @@ -46,8 +46,8 @@ bool IsActiveWindow(aura::Window* window) {
|
| }
|
|
|
| aura::Window* GetActiveWindow() {
|
| - return aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())->
|
| - GetActiveWindow();
|
| + return aura::client::GetActivationClient(Shell::GetPrimaryRootWindow())
|
| + ->GetActiveWindow();
|
| }
|
|
|
| aura::Window* GetActivatableWindow(aura::Window* window) {
|
| @@ -108,8 +108,7 @@ void SetSnapsChildrenToPhysicalPixelBoundary(aura::Window* container) {
|
| void InstallSnapLayoutManagerToContainers(aura::Window* parent) {
|
| aura::Window::Windows children = parent->children();
|
| for (aura::Window::Windows::iterator iter = children.begin();
|
| - iter != children.end();
|
| - ++iter) {
|
| + iter != children.end(); ++iter) {
|
| aura::Window* container = *iter;
|
| if (container->id() < 0) // not a container
|
| continue;
|
|
|