17 files changed, 23 insertions, 23 deletions
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index 2882819..c996a98 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #include "app/animation.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
 
 namespace views {
 
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index fd03318..01eed94 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -11,11 +11,11 @@
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win/window_impl.h"
-#include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
+#include "gfx/rect.h"
 #include "views/accelerator.h"
 
 namespace views {
diff --git a/views/controls/native/native_view_host_gtk.h b/views/controls/native/native_view_host_gtk.h
index 218db0d..b055098 100644
--- a/views/controls/native/native_view_host_gtk.h
+++ b/views/controls/native/native_view_host_gtk.h
@@ -8,8 +8,8 @@
 #include <gtk/gtk.h>
 #include <string>
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 
 namespace views {
diff --git a/views/controls/table/table_view2.h b/views/controls/table/table_view2.h
index 7d83953..fb12b06 100644
--- a/views/controls/table/table_view2.h
+++ b/views/controls/table/table_view2.h
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "app/table_model_observer.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/native_table_wrapper.h"
 #include "views/view.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index d07feb4..cb733d8 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -12,11 +12,11 @@
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/point.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
 #include "gfx/icon_util.h"
+#include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
diff --git a/views/drag_utils_gtk.cc b/views/drag_utils_gtk.cc
index e0d221a..e715258 100644
--- a/views/drag_utils_gtk.cc
+++ b/views/drag_utils_gtk.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/gtk_util.h"
-#include "base/gfx/point.h"
-#include "base/gfx/size.h"
-#include "base/logging.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_gtk.h"
+#include "base/logging.h"
+#include "gfx/point.h"
+#include "gfx/size.h"
 
 namespace drag_utils {
 
diff --git a/views/event.h b/views/event.h
index d7831ce..8ee9413 100644
--- a/views/event.h
+++ b/views/event.h
@@ -6,8 +6,8 @@
 #define VIEWS_EVENT_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
 #include "base/keyboard_codes.h"
+#include "gfx/point.h"
 
 #if defined(OS_LINUX)
 typedef struct _GdkEventKey GdkEventKey;
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 8ee99e6..c1fbdcf 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -10,10 +10,10 @@
 
 #include "app/combobox_model.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/background.h"
 #include "views/border.h"
diff --git a/views/screen.h b/views/screen.h
index f95b368..45f3727 100644
--- a/views/screen.h
+++ b/views/screen.h
@@ -6,8 +6,8 @@
 #define VIEWS_SCREEN_H_
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 
 namespace views {
 
diff --git a/views/view.h b/views/view.h
index 0dcc734..04eecc9 100644
--- a/views/view.h
+++ b/views/view.h
@@ -15,8 +15,8 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "app/os_exchange_data.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
 #include "views/accelerator.h"
 #include "views/accessibility/accessibility_types.h"
 #include "views/background.h"
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index b7ae5d2..138ff53 100644
--- a/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.cc
@@ -9,8 +9,8 @@
 #include <shlobj.h>
 
 #include "app/l10n_util_win.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
+#include "gfx/point.h"
 
 namespace views {
 
diff --git a/views/widget/drop_target_gtk.cc b/views/widget/drop_target_gtk.cc
index d225ba8..8a68db8 100644
--- a/views/widget/drop_target_gtk.cc
+++ b/views/widget/drop_target_gtk.cc
@@ -13,8 +13,8 @@
 #include "app/gtk_dnd_util.h"
 #include "app/os_exchange_data_provider_gtk.h"
 #include "base/file_path.h"
-#include "base/gfx/point.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/point.h"
 #include "net/base/net_util.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
diff --git a/views/widget/drop_target_win.cc b/views/widget/drop_target_win.cc
index 7a90a64..168cd22 100644
--- a/views/widget/drop_target_win.cc
+++ b/views/widget/drop_target_win.cc
@@ -7,7 +7,7 @@
 #include "app/drag_drop_types.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h
index 5a05a45..6865095 100644
--- a/views/widget/tooltip_manager_win.h
+++ b/views/widget/tooltip_manager_win.h
@@ -11,7 +11,7 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 #include "base/task.h"
 #include "views/widget/tooltip_manager.h"
 
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index dbf4627..b317367 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -8,8 +8,8 @@
 #include <gtk/gtk.h>
 
 #include "app/active_window_watcher_x.h"
-#include "base/gfx/size.h"
 #include "base/message_loop.h"
+#include "gfx/size.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
diff --git a/views/window/window.cc b/views/window/window.cc
index 18b4d51..99bda55 100644
--- a/views/window/window.cc
+++ b/views/window/window.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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.
 
 #include "views/window/window.h"
 
 #include "app/gfx/font.h"
 #include "app/gfx/font_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/size.h"
 #include "base/string_util.h"
+#include "gfx/size.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index e1b2c0f..8f5571d 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "base/utf_string_conversions.h"
 #include "views/event.h"
 #include "views/screen.h"