Fix references to ui/gfx headers in a*/.

ash/wm/lock_layout_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_LOCK_LAYOUT_MANAGER_H_
 #define ASH_WM_LOCK_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/shell_delegate.h"
 #include "ash/snap_to_pixel_layout_manager.h"
 #include "ash/wm/wm_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_observer.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace aura {
 class RootWindow;
 class Window;
 }
 
 namespace ui {
 class Layer;
@@ skipping 66 matching lines @@
 
   // The bounds of the keyboard.
   gfx::Rect keyboard_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(LockLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_LOCK_LAYOUT_MANAGER_H_