Move base/gfx contents to gfx/

TBR=darin BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41559 0039d316-1c4b-4281-b951-d872f2087c98
author: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2010-03-14 23:30:59 +0000
committer: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2010-03-14 23:30:59 +0000
commit: e0fc2f1f81f13440af3bb4cf5e56a031f91fc163 (patch)
tree: c84d3625eac633ea78d68688ecd74e2d0a158334
parent: 98af9aca7168f061bfaae5cd4f4eb3f7de4e70e7 (diff)
download: chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.zip
chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.gz
chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.bz2
254 files changed, 656 insertions, 344 deletions
diff --git a/app/DEPS b/app/DEPS
index c08f940..2b51fbb 100644
--- a/app/DEPS
+++ b/app/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+gfx",
   "+grit/app_locale_settings.h",
   "+grit/app_strings.h",
   "+net",
diff --git a/app/animation.cc b/app/animation.cc
index b341d2a..f2d95f4 100644
--- a/app/animation.cc
+++ b/app/animation.cc
@@ -4,8 +4,8 @@
 
 #include "app/animation.h"
 
-#include "base/gfx/rect.h"
 #include "base/message_loop.h"
+#include "gfx/rect.h"
 
 #if defined(OS_WIN)
 #include "base/win_util.h"
diff --git a/app/clipboard/clipboard.cc b/app/clipboard/clipboard.cc
index 9ac742d..fa4f5a5 100644
--- a/app/clipboard/clipboard.cc
+++ b/app/clipboard/clipboard.cc
@@ -4,9 +4,9 @@
 
 #include "app/clipboard/clipboard.h"
 
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_linux.cc b/app/clipboard/clipboard_linux.cc
index fbffd98..e7994de 100644
--- a/app/clipboard/clipboard_linux.cc
+++ b/app/clipboard/clipboard_linux.cc
@@ -11,11 +11,11 @@
 #include <utility>
 
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/linux_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_mac.mm b/app/clipboard/clipboard_mac.mm
index 94de2b9..4673e6e 100644
--- a/app/clipboard/clipboard_mac.mm
+++ b/app/clipboard/clipboard_mac.mm
@@ -7,13 +7,13 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/scoped_cftyperef.h"
 #include "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc
index e8c5ee0..d15247b 100644
--- a/app/clipboard/clipboard_unittest.cc
+++ b/app/clipboard/clipboard_unittest.cc
@@ -10,11 +10,11 @@
 #endif
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
diff --git a/app/clipboard/clipboard_win.cc b/app/clipboard/clipboard_win.cc
index b729a52..8ae60d3 100644
--- a/app/clipboard/clipboard_win.cc
+++ b/app/clipboard/clipboard_win.cc
@@ -12,13 +12,13 @@
 
 #include "app/clipboard/clipboard_util_win.h"
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/app/clipboard/scoped_clipboard_writer.cc b/app/clipboard/scoped_clipboard_writer.cc
index 5a3634f..01885ba7 100644
--- a/app/clipboard/scoped_clipboard_writer.cc
+++ b/app/clipboard/scoped_clipboard_writer.cc
@@ -8,9 +8,9 @@
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 
-#include "base/gfx/size.h"
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 
 ScopedClipboardWriter::ScopedClipboardWriter(Clipboard* clipboard)
     : clipboard_(clipboard) {
diff --git a/app/gfx/blit.cc b/app/gfx/blit.cc
index 99ac09f..62417d2 100644
--- a/app/gfx/blit.cc
+++ b/app/gfx/blit.cc
@@ -8,11 +8,11 @@
 #include <cairo/cairo.h>
 #endif
 
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #if defined(OS_MACOSX)
 #include "base/scoped_cftyperef.h"
 #endif
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/platform_device.h"
 
diff --git a/app/gfx/blit.h b/app/gfx/blit.h
index 9eaa93e..f4445d3 100644
--- a/app/gfx/blit.h
+++ b/app/gfx/blit.h
@@ -6,8 +6,8 @@
 #define APP_GFX_BLIT_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 skia {
 class PlatformCanvas;
diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc
index 420c984..75f8011 100644
--- a/app/gfx/canvas.cc
+++ b/app/gfx/canvas.cc
@@ -8,8 +8,8 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
diff --git a/app/gfx/canvas_linux.cc b/app/gfx/canvas_linux.cc
index 1b3d824..fdd1242 100644
--- a/app/gfx/canvas_linux.cc
+++ b/app/gfx/canvas_linux.cc
@@ -10,9 +10,9 @@
 #include <pango/pangocairo.h>
 
 #include "app/gfx/font.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/rect.h"
 
 namespace {
 
diff --git a/app/gfx/canvas_mac.mm b/app/gfx/canvas_mac.mm
index b766b32..acc2d71 100644
--- a/app/gfx/canvas_mac.mm
+++ b/app/gfx/canvas_mac.mm
@@ -8,9 +8,9 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace gfx {
diff --git a/app/gfx/canvas_win.cc b/app/gfx/canvas_win.cc
index f35fab8..de9d45a 100644
--- a/app/gfx/canvas_win.cc
+++ b/app/gfx/canvas_win.cc
@@ -8,7 +8,7 @@
 
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 namespace {
diff --git a/app/gfx/font_util.h b/app/gfx/font_util.h
index 36bc693..29caeb4 100644
--- a/app/gfx/font_util.h
+++ b/app/gfx/font_util.h
@@ -5,7 +5,7 @@
 #ifndef APP_GFX_FONT_UTIL_H_
 #define APP_GFX_FONT_UTIL_H_
 
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gdi_util.h b/app/gfx/gdi_util.h
index f2f9210..7da4926 100644
--- a/app/gfx/gdi_util.h
+++ b/app/gfx/gdi_util.h
@@ -7,7 +7,8 @@
 
 #include <vector>
 #include <windows.h>
-#include "base/gfx/rect.h"
+
+#include "gfx/rect.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gtk_native_view_id_manager.cc b/app/gfx/gtk_native_view_id_manager.cc
index b0dcc10..211db4e 100644
--- a/app/gfx/gtk_native_view_id_manager.cc
+++ b/app/gfx/gtk_native_view_id_manager.cc
@@ -4,9 +4,9 @@
 
 #include "app/gfx/gtk_native_view_id_manager.h"
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
+#include "gfx/rect.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
diff --git a/app/gfx/gtk_util.cc b/app/gfx/gtk_util.cc
index 98b174b..32d48a5 100644
--- a/app/gfx/gtk_util.cc
+++ b/app/gfx/gtk_util.cc
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/linux_util.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 
diff --git a/app/gfx/native_theme_win.cc b/app/gfx/native_theme_win.cc
index 594042b..9c60ef9 100644
--- a/app/gfx/native_theme_win.cc
+++ b/app/gfx/native_theme_win.cc
@@ -10,9 +10,9 @@
 #include <vssym32.h>
 
 #include "app/gfx/gdi_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkShader.h"
diff --git a/app/gfx/native_theme_win.h b/app/gfx/native_theme_win.h
index 62415b4..504ce46 100644
--- a/app/gfx/native_theme_win.h
+++ b/app/gfx/native_theme_win.h
@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <uxtheme.h>
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace skia {
diff --git a/app/gfx/skia_util.cc b/app/gfx/skia_util.cc
index fa6ec24..f5f03b8 100644
--- a/app/gfx/skia_util.cc
+++ b/app/gfx/skia_util.cc
@@ -4,7 +4,7 @@
 
 #include "app/gfx/skia_util.h"
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/app/os_exchange_data_provider_gtk.h b/app/os_exchange_data_provider_gtk.h
index a53957d..6791fbe 100644
--- a/app/os_exchange_data_provider_gtk.h
+++ b/app/os_exchange_data_provider_gtk.h
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include "app/os_exchange_data.h"
-#include "base/gfx/point.h"
 #include "base/pickle.h"
 #include "base/string16.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 
 // OSExchangeData::Provider implementation for Gtk. OSExchangeDataProviderGtk
diff --git a/app/win/window_impl.h b/app/win/window_impl.h
index 2f6a2ab..b4ba830 100644
--- a/app/win/window_impl.h
+++ b/app/win/window_impl.h
@@ -13,8 +13,8 @@
 #include <string>
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
 
 namespace app {
 
diff --git a/app/win_util.h b/app/win_util.h
index 802cc35..cac4b39 100644
--- a/app/win_util.h
+++ b/app/win_util.h
@@ -12,8 +12,8 @@
 
 #include "app/gfx/font.h"
 #include "base/fix_wp64.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_handle.h"
+#include "gfx/rect.h"
 
 class FilePath;
 
diff --git a/base/base.gyp b/base/base.gyp
index 30d746d..1a40a29 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -71,7 +71,6 @@
         'file_util_unittest.cc',
         'file_version_info_unittest.cc',
         'file_watcher_unittest.cc',
-        'gfx/rect_unittest.cc',
         'gmock_unittest.cc',
         'histogram_unittest.cc',
         'hmac_unittest.cc',
diff --git a/base/base.gypi b/base/base.gypi
index 1fbb537..a251641 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -519,12 +519,6 @@
         'field_trial.h',
         'file_descriptor_shuffle.cc',
         'file_descriptor_shuffle.h',
-        'gfx/point.cc',
-        'gfx/point.h',
-        'gfx/rect.cc',
-        'gfx/rect.h',
-        'gfx/size.cc',
-        'gfx/size.h',
         'hmac.h',
         'hmac_mac.cc',
         'hmac_nss.cc',
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
index e90d755..c1d7d11 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
@@ -19,6 +18,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditController;
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
index 6b28844..5a70578 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac_unittest.mm
@@ -6,11 +6,11 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "base/gfx/size.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
+#include "gfx/size.h"
 #include "testing/platform_test.h"
 
 namespace {
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 8d42889..9f59d9c 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -14,7 +14,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 
 namespace {
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index fc6474a..e912ff9 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -7,12 +7,12 @@
 #include "app/gfx/text_elider.h"
 #include "app/resource_bundle.h"
 #include "base/sys_string_conversions.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/cocoa/event_utils.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
diff --git a/chrome/browser/automation/automation_provider_gtk.cc b/chrome/browser/automation/automation_provider_gtk.cc
index 45623a2..601e81a 100644
--- a/chrome/browser/automation/automation_provider_gtk.cc
+++ b/chrome/browser/automation/automation_provider_gtk.cc
@@ -6,13 +6,13 @@
 
 #include <gtk/gtk.h>
 
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/view_id_util.h"
 #include "chrome/test/automation/automation_messages.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 
 void AutomationProvider::SetWindowBounds(int handle, const gfx::Rect& bounds,
                                          bool* success) {
diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm
index e17d59c..f58b7a8 100644
--- a/chrome/browser/automation/automation_provider_mac.mm
+++ b/chrome/browser/automation/automation_provider_mac.mm
@@ -8,11 +8,11 @@
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/tab_window_controller.h"
 #include "chrome/test/automation/automation_messages.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "grit/generated_resources.h"
 
 void AutomationProvider::SetWindowBounds(int handle, const gfx::Rect& bounds,
diff --git a/chrome/browser/automation/automation_provider_views.cc b/chrome/browser/automation/automation_provider_views.cc
index 02cb229..f161105 100644
--- a/chrome/browser/automation/automation_provider_views.cc
+++ b/chrome/browser/automation/automation_provider_views.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/automation/automation_provider.h"
 
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h
index e78a13f..f401273 100644
--- a/chrome/browser/automation/ui_controls.h
+++ b/chrome/browser/automation/ui_controls.h
@@ -14,7 +14,7 @@
 #endif
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 #include "base/keyboard_codes.h"
 
 #if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/automation/ui_controls_linux.cc b/chrome/browser/automation/ui_controls_linux.cc
index ae4c072..aac9134 100644
--- a/chrome/browser/automation/ui_controls_linux.cc
+++ b/chrome/browser/automation/ui_controls_linux.cc
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "base/keyboard_code_conversion_gtk.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index f4e1b3c7..bc3972a 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -11,12 +11,12 @@
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
-#include "base/gfx/point.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/thread.h"
+#include "gfx/point.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index b3aba9a..0082504 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/command_updater.h"
@@ -23,6 +22,7 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_zoom.h"
+#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BrowserWindow;
diff --git a/chrome/browser/chromeos/compact_location_bar_host.h b/chrome/browser/chromeos/compact_location_bar_host.h
index 6fbc99b..cb3e221 100644
--- a/chrome/browser/chromeos/compact_location_bar_host.h
+++ b/chrome/browser/chromeos/compact_location_bar_host.h
@@ -7,10 +7,10 @@
 
 #include "app/animation.h"
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/timer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/dropdown_bar_host.h"
+#include "gfx/rect.h"
 #include "views/controls/textfield/textfield.h"
 
 class BrowserView;
diff --git a/chrome/browser/chromeos/compact_location_bar_view.cc b/chrome/browser/chromeos/compact_location_bar_view.cc
index 0907689..9fddf15 100644
--- a/chrome/browser/chromeos/compact_location_bar_view.cc
+++ b/chrome/browser/chromeos/compact_location_bar_view.cc
@@ -11,7 +11,6 @@
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/point.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -27,6 +26,7 @@
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
+#include "gfx/point.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index 2c1b893..f5e730a 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -8,13 +8,13 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/size.h"
 #include "base/task.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_controller.h"
 #include "chrome/browser/chromeos/wm_message_listener.h"
+#include "gfx/size.h"
 
 class Authenticator;
 
diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
index d4e073c..82a2594 100644
--- a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
+++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/chromeos/notifications/balloon_view.h"
@@ -13,6 +11,8 @@
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/window_sizer.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h
index 9eb5378..2086d5b 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.h
+++ b/chrome/browser/chromeos/notifications/balloon_view.h
@@ -10,14 +10,14 @@
 #include "app/gfx/path.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "views/controls/button/button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/browser/chromeos/notifications/notification_panel.h b/chrome/browser/chromeos/notifications/notification_panel.h
index 3036b18..6a5f8cd 100644
--- a/chrome/browser/chromeos/notifications/notification_panel.h
+++ b/chrome/browser/chromeos/notifications/notification_panel.h
@@ -7,11 +7,11 @@
 #ifndef CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_NOTIFICATION_PANEL_H_
 #define CHROME_BROWSER_CHROMEOS_NOTIFICATIONS_NOTIFICATION_PANEL_H_
 
-#include "base/gfx/rect.h"
 #include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/frame/panel_controller.h"
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
+#include "gfx/rect.h"
 
 class Balloon;
 
diff --git a/chrome/browser/cocoa/base_view.h b/chrome/browser/cocoa/base_view.h
index 5147451..a7f6c68 100644
--- a/chrome/browser/cocoa/base_view.h
+++ b/chrome/browser/cocoa/base_view.h
@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 // A view that provides common functionality that many views will need:
 // - Automatic registration for mouse-moved events.
diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm
index 81af0a7..5c1c7ad 100644
--- a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm
+++ b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm
@@ -6,7 +6,7 @@
 
 #include "app/gfx/canvas_paint.h"
 #include "app/theme_provider.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 42a68c8..8380256 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -5,7 +5,6 @@
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 
 #include "app/l10n_util_mac.h"
-#include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
@@ -36,6 +35,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/rect.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/cocoa/extension_view_mac.h b/chrome/browser/cocoa/extension_view_mac.h
index 5fb0f54..f4f8d74 100644
--- a/chrome/browser/cocoa/extension_view_mac.h
+++ b/chrome/browser/cocoa/extension_view_mac.h
@@ -7,7 +7,7 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Browser;
diff --git a/chrome/browser/cocoa/extensions/browser_action_button.mm b/chrome/browser/cocoa/extensions/browser_action_button.mm
index e12081a..c21b76fd 100644
--- a/chrome/browser/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/cocoa/extensions/browser_action_button.mm
@@ -5,8 +5,6 @@
 #import "chrome/browser/cocoa/extensions/browser_action_button.h"
 
 #include "app/gfx/canvas_paint.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
@@ -15,6 +13,8 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "skia/ext/skia_utils_mac.h"
 
 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;
diff --git a/chrome/browser/cocoa/html_dialog_window_controller.mm b/chrome/browser/cocoa/html_dialog_window_controller.mm
index 9287a1a9..f2b79ea 100644
--- a/chrome/browser/cocoa/html_dialog_window_controller.mm
+++ b/chrome/browser/cocoa/html_dialog_window_controller.mm
@@ -4,7 +4,6 @@
 
 #import "chrome/browser/cocoa/html_dialog_window_controller.h"
 
-#include "base/gfx/size.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/scoped_nsobject.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/size.h"
 #include "ipc/ipc_message.h"
 
 // Thin bridge that routes notifications to
diff --git a/chrome/browser/cocoa/html_dialog_window_controller_unittest.mm b/chrome/browser/cocoa/html_dialog_window_controller_unittest.mm
index 59ad8da..e5f1ea7 100644
--- a/chrome/browser/cocoa/html_dialog_window_controller_unittest.mm
+++ b/chrome/browser/cocoa/html_dialog_window_controller_unittest.mm
@@ -9,13 +9,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/gfx/size.h"
 #import "base/scoped_nsautorelease_pool.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/test/browser_with_test_window_test.h"
+#include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/cocoa/notifications/balloon_view_bridge.h b/chrome/browser/cocoa/notifications/balloon_view_bridge.h
index 627e156..b3c552b 100644
--- a/chrome/browser/cocoa/notifications/balloon_view_bridge.h
+++ b/chrome/browser/cocoa/notifications/balloon_view_bridge.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_COCOA_NOTIFICATIONS_BALLOON_VIEW_BRIDGE_H_
 #define CHROME_BROWSER_COCOA_NOTIFICATIONS_BALLOON_VIEW_BRIDGE_H_
 
-#include "base/gfx/size.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/notifications/balloon_controller.h"
 #include "chrome/browser/notifications/balloon.h"
+#include "gfx/size.h"
 
 // Bridges from the cross-platform BalloonView interface to the Cocoa
 // controller which will draw the view on screen.
diff --git a/chrome/browser/cocoa/status_bubble_mac.mm b/chrome/browser/cocoa/status_bubble_mac.mm
index 460e43d..3949441 100644
--- a/chrome/browser/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/cocoa/status_bubble_mac.mm
@@ -8,11 +8,11 @@
 
 #include "app/gfx/text_elider.h"
 #include "base/compiler_specific.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bubble_view.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm
index 53e6b3a..631bc74 100644
--- a/chrome/browser/cocoa/toolbar_controller.mm
+++ b/chrome/browser/cocoa/toolbar_controller.mm
@@ -10,7 +10,6 @@
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
-#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_menu_model.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
@@ -40,6 +39,7 @@
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/rect.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/dock_info.h b/chrome/browser/dock_info.h
index 043abd7..3130488 100644
--- a/chrome/browser/dock_info.h
+++ b/chrome/browser/dock_info.h
@@ -8,8 +8,8 @@
 #include <set>
 
 #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"
 
 // DockInfo is used to do determine possible dock locations for a dragged
 // tab. To use DockInfo invoke GetDockInfoAtPoint. This returns a new
diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
index 5dfe24a0..a088671 100644
--- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
+++ b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser.h"
@@ -14,6 +13,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/test_browser_window.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 33ac9cd..6aa33e1 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -12,7 +12,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
-#include "base/gfx/rect.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
@@ -25,6 +24,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/time_format.h"
+#include "gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index a8cd84c..93975e7 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -8,8 +8,6 @@
 #include <gtk/gtk.h>
 #endif
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
@@ -23,6 +21,8 @@
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/ui_test_utils.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 static const int kTimeoutMs = 60 * 1000;  // 1 minute
 
diff --git a/chrome/browser/extensions/browser_action_test_util_mac.mm b/chrome/browser/extensions/browser_action_test_util_mac.mm
index 46be664..3177057 100644
--- a/chrome/browser/extensions/browser_action_test_util_mac.mm
+++ b/chrome/browser/extensions/browser_action_test_util_mac.mm
@@ -4,8 +4,6 @@
 
 #include "browser_action_test_util.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/browser_window_cocoa.h"
@@ -14,6 +12,8 @@
 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/cocoa/info_bubble_window.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/chrome/browser/extensions/browser_action_test_util_views.cc b/chrome/browser/extensions/browser_action_test_util_views.cc
index 4d94ce3..fad2f7d 100644
--- a/chrome/browser/extensions/browser_action_test_util_views.cc
+++ b/chrome/browser/extensions/browser_action_test_util_views.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
@@ -14,6 +12,8 @@
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc
index 00e6365..c70747d 100644
--- a/chrome/browser/extensions/extension_popup_api.cc
+++ b/chrome/browser/extensions/extension_popup_api.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/extensions/extension_popup_api.h"
 
-#include "base/gfx/point.h"
 #include "base/json/json_writer.h"
 #include "base/string_util.h"
 #include "chrome/common/extensions/extension.h"
@@ -19,6 +18,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/point.h"
+
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "views/view.h"
diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc
index b338e61..b2dea64 100644
--- a/chrome/browser/extensions/extension_uitest.cc
+++ b/chrome/browser/extensions/extension_uitest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/gfx/rect.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ -16,6 +15,7 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index 8f2541c..a6eafca 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/extensions/image_loading_tracker.h"
 
 #include "base/file_util.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
@@ -13,6 +12,7 @@
 #include "base/thread.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "gfx/size.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/image_decoder.h"
diff --git a/chrome/browser/find_bar.h b/chrome/browser/find_bar.h
index a593e71..7797387 100644
--- a/chrome/browser/find_bar.h
+++ b/chrome/browser/find_bar.h
@@ -9,8 +9,8 @@
 #ifndef CHROME_BROWSER_FIND_BAR_H_
 #define CHROME_BROWSER_FIND_BAR_H_
 
-#include "base/gfx/rect.h"
 #include "base/string16.h"
+#include "gfx/rect.h"
 
 class FindBarController;
 class FindBarTesting;
diff --git a/chrome/browser/find_bar_controller.h b/chrome/browser/find_bar_controller.h
index 5f37a2a..8edbc79 100644
--- a/chrome/browser/find_bar_controller.h
+++ b/chrome/browser/find_bar_controller.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_FIND_BAR_CONTROLLER_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/rect.h"
 
 class FindBar;
 class TabContents;
diff --git a/chrome/browser/find_notification_details.h b/chrome/browser/find_notification_details.h
index 45dd331..fbab3c4 100644
--- a/chrome/browser/find_notification_details.h
+++ b/chrome/browser/find_notification_details.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_FIND_NOTIFICATION_DETAILS_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 class FindNotificationDetails {
  public:
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 5a6ad93..66da4f4 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -12,7 +12,6 @@
 
 #include "app/gtk_signal.h"
 #include "app/slide_animation.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/size.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BookmarkMenuController;
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.h b/chrome/browser/gtk/bookmark_manager_gtk.h
index 2c664b3..8ade7f5 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.h
+++ b/chrome/browser/gtk/bookmark_manager_gtk.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/gtk/gtk_tree.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/shell_dialogs.h"
+#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class BookmarkModel;
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index f1dc892..b49d501 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -17,7 +17,6 @@
 #include "app/theme_provider.h"
 #include "base/base_paths.h"
 #include "base/command_line.h"
-#include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -82,6 +81,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/rect.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h
index 18ba31f..822dff0 100644
--- a/chrome/browser/gtk/browser_window_gtk.h
+++ b/chrome/browser/gtk/browser_window_gtk.h
@@ -10,7 +10,6 @@
 #include <map>
 
 #include "app/active_window_watcher_x.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "build/build_config.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/x11_util.h"
+#include "gfx/rect.h"
 
 class BookmarkBarGtk;
 class Browser;
diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h
index e7ab3d2..239d7c1 100644
--- a/chrome/browser/gtk/custom_button.h
+++ b/chrome/browser/gtk/custom_button.h
@@ -10,11 +10,11 @@
 #include <string>
 
 #include "app/slide_animation.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class CairoCachedSurface;
diff --git a/chrome/browser/gtk/download_started_animation_gtk.cc b/chrome/browser/gtk/download_started_animation_gtk.cc
index 513a060..1e10348 100644
--- a/chrome/browser/gtk/download_started_animation_gtk.cc
+++ b/chrome/browser/gtk/download_started_animation_gtk.cc
@@ -8,11 +8,11 @@
 
 #include "app/animation.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 
 namespace {
diff --git a/chrome/browser/gtk/extension_popup_gtk.h b/chrome/browser/gtk/extension_popup_gtk.h
index 206feb3..62750fe 100644
--- a/chrome/browser/gtk/extension_popup_gtk.h
+++ b/chrome/browser/gtk/extension_popup_gtk.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_GTK_EXTENSION_POPUP_GTK_H_
 #define CHROME_BROWSER_GTK_EXTENSION_POPUP_GTK_H_
 
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/rect.h"
 
 class Browser;
 class ExtensionHost;
diff --git a/chrome/browser/gtk/extension_view_gtk.h b/chrome/browser/gtk/extension_view_gtk.h
index 40c2196..089f230 100644
--- a/chrome/browser/gtk/extension_view_gtk.h
+++ b/chrome/browser/gtk/extension_view_gtk.h
@@ -7,7 +7,7 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Browser;
diff --git a/chrome/browser/gtk/gtk_util.h b/chrome/browser/gtk/gtk_util.h
index d2fca75..b2149b3 100644
--- a/chrome/browser/gtk/gtk_util.h
+++ b/chrome/browser/gtk/gtk_util.h
@@ -9,9 +9,9 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/common/x11_util.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
 typedef struct _GtkWidget GtkWidget;
diff --git a/chrome/browser/gtk/html_dialog_gtk.h b/chrome/browser/gtk/html_dialog_gtk.h
index 00a7a4d..2bda618 100644
--- a/chrome/browser/gtk/html_dialog_gtk.h
+++ b/chrome/browser/gtk/html_dialog_gtk.h
@@ -9,10 +9,10 @@
 #include <vector>
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
+#include "gfx/size.h"
 
 typedef struct _GtkWidget GtkWidget;
 
diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc
index 87c9ff6..edd5a79 100644
--- a/chrome/browser/gtk/info_bubble_gtk.cc
+++ b/chrome/browser/gtk/info_bubble_gtk.cc
@@ -11,11 +11,11 @@
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/rect.h"
 
 namespace {
 
diff --git a/chrome/browser/gtk/info_bubble_gtk.h b/chrome/browser/gtk/info_bubble_gtk.h
index dd9c178..ae5048b 100644
--- a/chrome/browser/gtk/info_bubble_gtk.h
+++ b/chrome/browser/gtk/info_bubble_gtk.h
@@ -16,9 +16,9 @@
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 
 class GtkThemeProvider;
 class InfoBubbleGtk;
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h
index 84ad7fc0..6f076c4 100644
--- a/chrome/browser/gtk/menu_gtk.h
+++ b/chrome/browser/gtk/menu_gtk.h
@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/point.h"
 #include "base/task.h"
+#include "gfx/point.h"
 
 class SkBitmap;
 
diff --git a/chrome/browser/gtk/nine_box.cc b/chrome/browser/gtk/nine_box.cc
index 572c1b5..261856a 100644
--- a/chrome/browser/gtk/nine_box.cc
+++ b/chrome/browser/gtk/nine_box.cc
@@ -9,8 +9,8 @@
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
 #include "base/logging.h"
+#include "gfx/point.h"
 
 namespace {
 
diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.h b/chrome/browser/gtk/notifications/balloon_view_gtk.h
index a6ea598..9e2e871 100644
--- a/chrome/browser/gtk/notifications/balloon_view_gtk.h
+++ b/chrome/browser/gtk/notifications/balloon_view_gtk.h
@@ -9,14 +9,14 @@
 
 #include "app/animation.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class BalloonCollection;
 class BalloonViewHost;
diff --git a/chrome/browser/gtk/status_bubble_gtk.h b/chrome/browser/gtk/status_bubble_gtk.h
index 523dfcb..c15bcd1 100644
--- a/chrome/browser/gtk/status_bubble_gtk.h
+++ b/chrome/browser/gtk/status_bubble_gtk.h
@@ -9,13 +9,13 @@
 
 #include <string>
 
-#include "base/gfx/point.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/status_bubble.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/point.h"
 
 class GtkThemeProvider;
 class GURL;
diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
index ab40aca..2da74ea 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
@@ -10,11 +10,11 @@
 #include "app/gfx/canvas.h"
 #include "app/slide_animation.h"
 #include "base/callback.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class TabContents;
 class TabRendererGtk;
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
index c62a87c..528a091 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
@@ -13,11 +13,11 @@
 #include "app/gfx/font.h"
 #include "app/slide_animation.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/string16.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace gfx {
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 7c52293..48134f9 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -12,7 +12,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/browser_theme_provider.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
+#include "gfx/point.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.h b/chrome/browser/gtk/tabs/tab_strip_gtk.h
index 570d39f..6a22a8b 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.h
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/task.h"
 #include "base/message_loop.h"
 #include "chrome/browser/gtk/tabstrip_origin_provider.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/rect.h"
 
 class BrowserWindowGtk;
 class CustomDrawButton;
diff --git a/chrome/browser/gtk/tabstrip_origin_provider.h b/chrome/browser/gtk/tabstrip_origin_provider.h
index 027f049..47baf91 100644
--- a/chrome/browser/gtk/tabstrip_origin_provider.h
+++ b/chrome/browser/gtk/tabstrip_origin_provider.h
@@ -5,6 +5,10 @@
 #ifndef CHROME_BROWSER_GTK_TABSTRIP_ORIGIN_PROVIDER_H_
 #define CHROME_BROWSER_GTK_TABSTRIP_ORIGIN_PROVIDER_H_
 
+namespace gfx{
+class Point;
+}
+
 // Abstract interface that provides an offset of a widget. Many pieces of the
 // UI don't need the full BrowserWindowGtk, but just need information about
 // it's position relative to the tabstrip to draw correctly. This interface
diff --git a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
index 8715dde..a57d79e 100644
--- a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
+++ b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc
@@ -6,7 +6,6 @@
 
 #include "app/gtk_dnd_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/bookmark_bubble_gtk.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 
 ToolbarStarToggleGtk::ToolbarStarToggleGtk(BrowserToolbarGtk* host)
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc
index ba24521..6fb5824 100644
--- a/chrome/browser/icon_loader_win.cc
+++ b/chrome/browser/icon_loader_win.cc
@@ -7,10 +7,10 @@
 #include <windows.h>
 #include <shellapi.h>
 
-#include "base/gfx/size.h"
 #include "base/message_loop.h"
 #include "base/thread.h"
 #include "gfx/icon_util.h"
+#include "gfx/size.h"
 
 void IconLoader::ReadIcon() {
   int size = 0;
diff --git a/chrome/browser/ime_input.h b/chrome/browser/ime_input.h
index 1d2919b..b1ebf4a 100644
--- a/chrome/browser/ime_input.h
+++ b/chrome/browser/ime_input.h
@@ -10,7 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 // This header file defines a struct and a class used for encapsulating IMM32
 // APIs, controls IMEs attached to a window, and enables the 'on-the-spot'
diff --git a/chrome/browser/modal_html_dialog_delegate.h b/chrome/browser/modal_html_dialog_delegate.h
index bcd5361..80f83ca 100644
--- a/chrome/browser/modal_html_dialog_delegate.h
+++ b/chrome/browser/modal_html_dialog_delegate.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
-#include "base/gfx/size.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/size.h"
 #include "ipc/ipc_message.h"
 
 // This class can only be used on the UI thread.
diff --git a/chrome/browser/notifications/balloon.cc b/chrome/browser/notifications/balloon.cc
index da49395..040abec 100644
--- a/chrome/browser/notifications/balloon.cc
+++ b/chrome/browser/notifications/balloon.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/notifications/balloon.h"
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/renderer_host/site_instance.h"
+#include "gfx/rect.h"
 
 Balloon::Balloon(const Notification& notification, Profile* profile,
                  BalloonCollection* collection)
diff --git a/chrome/browser/notifications/balloon.h b/chrome/browser/notifications/balloon.h
index e5767b3..0136a9c 100644
--- a/chrome/browser/notifications/balloon.h
+++ b/chrome/browser/notifications/balloon.h
@@ -10,11 +10,11 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/notifications/notification.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class Balloon;
 class BalloonCollection;
diff --git a/chrome/browser/notifications/balloon_collection.cc b/chrome/browser/notifications/balloon_collection.cc
index 3d516ef..e828c66 100644
--- a/chrome/browser/notifications/balloon_collection.cc
+++ b/chrome/browser/notifications/balloon_collection.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/window_sizer.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 namespace {
 
diff --git a/chrome/browser/notifications/balloon_collection_impl.h b/chrome/browser/notifications/balloon_collection_impl.h
index ba54b51..c7fe67c 100644
--- a/chrome/browser/notifications/balloon_collection_impl.h
+++ b/chrome/browser/notifications/balloon_collection_impl.h
@@ -10,9 +10,9 @@
 #include <deque>
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/notifications/balloon_collection.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 
 // A balloon collection represents a set of notification balloons being
 // shown on the screen.  It positions new notifications according to
diff --git a/chrome/browser/notifications/balloon_collection_linux.cc b/chrome/browser/notifications/balloon_collection_linux.cc
index 54cd7ee..c82b3c1 100644
--- a/chrome/browser/notifications/balloon_collection_linux.cc
+++ b/chrome/browser/notifications/balloon_collection_linux.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 
-#include "base/gfx/size.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/views/notifications/balloon_view.h"
+#include "gfx/size.h"
 
 Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification,
                                             Profile* profile) {
diff --git a/chrome/browser/notifications/balloon_collection_win.cc b/chrome/browser/notifications/balloon_collection_win.cc
index e8b60e0..b162ea4 100644
--- a/chrome/browser/notifications/balloon_collection_win.cc
+++ b/chrome/browser/notifications/balloon_collection_win.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 
-#include "base/gfx/rect.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/views/notifications/balloon_view.h"
+#include "gfx/rect.h"
 
 Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification,
                                             Profile* profile) {
diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc
index 999119e..3f7a1bc 100644
--- a/chrome/browser/ntp_background_util.cc
+++ b/chrome/browser/ntp_background_util.cc
@@ -6,9 +6,9 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/skia_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_theme_provider.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/plugin_carbon_interpose_mac.cc b/chrome/browser/plugin_carbon_interpose_mac.cc
index 850b363..3d5918c 100644
--- a/chrome/browser/plugin_carbon_interpose_mac.cc
+++ b/chrome/browser/plugin_carbon_interpose_mac.cc
@@ -4,8 +4,8 @@
 
 #include <Carbon/Carbon.h>
 
-#include "base/gfx/rect.h"
 #include "chrome/plugin/plugin_interpose_util_mac.h"
+#include "gfx/rect.h"
 #include "webkit/glue/plugins/carbon_plugin_window_tracker_mac.h"
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
diff --git a/chrome/browser/pref_service_uitest.cc b/chrome/browser/pref_service_uitest.cc
index ca547a3..5d29691 100644
--- a/chrome/browser/pref_service_uitest.cc
+++ b/chrome/browser/pref_service_uitest.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/rect.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ -17,6 +16,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/rect.h"
 
 class PreferenceServiceTest : public UITest {
 public:
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_mac.h
index d9a7495..c3095a1 100644
--- a/chrome/browser/renderer_host/accelerated_surface_container_mac.h
+++ b/chrome/browser/renderer_host/accelerated_surface_container_mac.h
@@ -31,8 +31,8 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "base/gfx/rect.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
 
 namespace webkit_glue {
 struct WebPluginGeometry;
diff --git a/chrome/browser/renderer_host/backing_store.h b/chrome/browser/renderer_host/backing_store.h
index b32a0e2..d405025 100644
--- a/chrome/browser/renderer_host/backing_store.h
+++ b/chrome/browser/renderer_host/backing_store.h
@@ -8,10 +8,10 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/process.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class RenderProcessHost;
 class RenderWidgetHost;
diff --git a/chrome/browser/renderer_host/backing_store_manager.h b/chrome/browser/renderer_host/backing_store_manager.h
index 96edd93..ca187ab 100644
--- a/chrome/browser/renderer_host/backing_store_manager.h
+++ b/chrome/browser/renderer_host/backing_store_manager.h
@@ -8,10 +8,10 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/process.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class BackingStore;
 class RenderWidgetHost;
diff --git a/chrome/browser/renderer_host/backing_store_proxy.cc b/chrome/browser/renderer_host/backing_store_proxy.cc
index e31954b..c41900d 100644
--- a/chrome/browser/renderer_host/backing_store_proxy.cc
+++ b/chrome/browser/renderer_host/backing_store_proxy.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/renderer_host/backing_store_proxy.h"
 
-#include "base/gfx/rect.h"
 #include "build/build_config.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/common/render_messages.h"
+#include "gfx/rect.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/chrome/browser/renderer_host/backing_store_x.cc b/chrome/browser/renderer_host/backing_store_x.cc
index 62f3ebc..788e351 100644
--- a/chrome/browser/renderer_host/backing_store_x.cc
+++ b/chrome/browser/renderer_host/backing_store_x.cc
@@ -18,7 +18,6 @@
 #include <utility>
 
 #include "base/compiler_specific.h"
-#include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/transport_dib.h"
 #include "chrome/common/x11_util.h"
 #include "chrome/common/x11_util_internal.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc
index 3921059..f4fb1df 100644
--- a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc
+++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc
@@ -9,7 +9,6 @@
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
+#include "gfx/rect.h"
 #include "grit/generated_resources.h"
 
 GtkIMContextWrapper::GtkIMContextWrapper(RenderWidgetHostViewGtk* host_view)
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.cc b/chrome/browser/renderer_host/render_view_host_delegate.cc
index eb4c8ca..d744931 100644
--- a/chrome/browser/renderer_host/render_view_host_delegate.cc
+++ b/chrome/browser/renderer_host/render_view_host_delegate.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 
-#include "base/gfx/rect.h"
 #include "base/singleton.h"
 #include "chrome/common/renderer_preferences.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webpreferences.h"
 
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 35b7851..e20c241 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -9,7 +9,6 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/process.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
@@ -18,6 +17,7 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/property_bag.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/size.h"
 #include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index f2125ff..c3b0356 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -10,7 +10,6 @@
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
-#include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/process_util.h"
 #include "base/thread.h"
@@ -30,6 +29,7 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
+#include "gfx/rect.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 65f34c6..6438bd5 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -16,7 +16,6 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/callback.h"
 #include "base/file_path.h"
-#include "base/gfx/rect.h"
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
@@ -30,6 +29,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 
diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc
index 275576c..c0584a2 100644
--- a/chrome/browser/renderer_host/test/test_render_view_host.cc
+++ b/chrome/browser/renderer_host/test/test_render_view_host.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 
-#include "base/gfx/rect.h"
 #include "chrome/browser/renderer_host/test/test_backing_store.h"
 #include "chrome/browser/tab_contents/test_tab_contents.h"
 #include "chrome/common/dom_storage_common.h"
 #include "chrome/common/render_messages.h"
+#include "gfx/rect.h"
 
 using webkit_glue::PasswordForm;
 
diff --git a/chrome/browser/renderer_host/video_layer.h b/chrome/browser/renderer_host/video_layer.h
index 66a084f..66618cf 100644
--- a/chrome/browser/renderer_host/video_layer.h
+++ b/chrome/browser/renderer_host/video_layer.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_H_
 #define CHROME_BROWSER_RENDERER_HOST_VIDEO_LAYER_H_
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/size.h"
 
 class RenderProcessHost;
 class RenderWidgetHost;
diff --git a/chrome/browser/renderer_host/video_layer_proxy.cc b/chrome/browser/renderer_host/video_layer_proxy.cc
index 0280def..1fdae24 100644
--- a/chrome/browser/renderer_host/video_layer_proxy.cc
+++ b/chrome/browser/renderer_host/video_layer_proxy.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/renderer_host/video_layer_proxy.h"
 
-#include "base/gfx/rect.h"
 #include "chrome/browser/gpu_process_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/common/gpu_messages.h"
+#include "gfx/rect.h"
 
 VideoLayerProxy::VideoLayerProxy(RenderWidgetHost* widget,
                                  const gfx::Size& size,
diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h
index 6bc0142..0d31d15 100644
--- a/chrome/browser/sessions/session_types.h
+++ b/chrome/browser/sessions/session_types.h
@@ -8,12 +8,12 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/rect.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 4db50e0..07ea419 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
@@ -8,11 +8,11 @@
 #include <map>
 #include <string>
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/renderer_preferences.h"
+#include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 
 class NavigationEntry;
diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.h b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
index a929d8a..9330898 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_gtk.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
@@ -9,11 +9,11 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/point.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
+#include "gfx/point.h"
 
 class ContextMenuParams;
 class RenderWidgetHostView;
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
index acca99e..8248c0f 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
@@ -8,9 +8,9 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
+#include "gfx/rect.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index d6d688d..9fe797c0 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -15,7 +15,6 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cancelable_request.h"
@@ -42,6 +41,7 @@
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/property_bag.h"
 #include "chrome/common/renderer_preferences.h"
+#include "gfx/rect.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index a6ddbd1..9ac445a 100644
--- a/chrome/browser/tab_contents/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -9,11 +9,11 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/rect.h"
 #include "webkit/glue/context_menu.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h
index 5380fb0..ad0b6c4 100644
--- a/chrome/browser/tab_contents/tab_contents_view.h
+++ b/chrome/browser/tab_contents/tab_contents_view.h
@@ -10,10 +10,10 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 
 class Browser;
 class RenderViewHost;
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index e52053d..f7286de 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -9,9 +9,6 @@
 #include <gtk/gtk.h>
 
 #include "app/gtk_dnd_util.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
@@ -35,6 +32,9 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 
 using WebKit::WebDragOperation;
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h
index 1e8e174b..3a3d4c8 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.h
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.h
@@ -9,12 +9,12 @@
 
 #include <string>
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cocoa/base_view.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/size.h"
 
 class FilePath;
 class FindBarMac;
diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc
index ccd781e..9aa8fa6 100644
--- a/chrome/browser/tab_contents/thumbnail_generator.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "app/gfx/skbitmap_operations.h"
-#include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/time.h"
 #include "build/build_config.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/property_bag.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/tab_contents/web_drag_source_win.h b/chrome/browser/tab_contents/web_drag_source_win.h
index da20372..617970e 100644
--- a/chrome/browser/tab_contents/web_drag_source_win.h
+++ b/chrome/browser/tab_contents/web_drag_source_win.h
@@ -8,9 +8,9 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/base_drag_source.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/point.h"
 
 class RenderViewHost;
 class TabContents;
diff --git a/chrome/browser/tab_contents/web_drop_target_win.cc b/chrome/browser/tab_contents/web_drop_target_win.cc
index 578d9a9..f84a4b0 100644
--- a/chrome/browser/tab_contents/web_drop_target_win.cc
+++ b/chrome/browser/tab_contents/web_drop_target_win.cc
@@ -10,9 +10,9 @@
 #include "app/clipboard/clipboard_util_win.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
-#include "base/gfx/point.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "webkit/glue/webdropdata.h"
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 723d786..5966b5e 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -10,10 +10,10 @@
 #include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/size.h"
 #include "base/message_loop.h"
 // TODO(georgey) remove this when resources available.
 #include "chrome/browser/theme_resources_util.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/border.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
index 83bd517..9b021bf 100644
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ b/chrome/browser/views/bookmark_bubble_view.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
 
 #include "app/combobox_model.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/views/info_bubble.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "views/controls/button/button.h"
 #include "views/controls/combobox/combobox.h"
diff --git a/chrome/browser/views/chrome_views_delegate.cc b/chrome/browser/views/chrome_views_delegate.cc
index ce06b1a..68b2fe4 100644
--- a/chrome/browser/views/chrome_views_delegate.cc
+++ b/chrome/browser/views/chrome_views_delegate.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/views/chrome_views_delegate.h"
 
 #include "app/clipboard/clipboard.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
+#include "gfx/rect.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // ChromeViewsDelegate, views::ViewsDelegate implementation:
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc
index b2c0a77..8918489 100644
--- a/chrome/browser/views/constrained_window_win.cc
+++ b/chrome/browser/views/constrained_window_win.cc
@@ -11,7 +11,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
-#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"
@@ -24,6 +23,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/rect.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/constrained_window_win.h b/chrome/browser/views/constrained_window_win.h
index d5e3022..69a83dc 100644
--- a/chrome/browser/views/constrained_window_win.h
+++ b/chrome/browser/views/constrained_window_win.h
@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
 #define CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
 
-#include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "gfx/rect.h"
 #include "views/window/window_win.h"
 
 class ConstrainedTabContentsWindowDelegate;
diff --git a/chrome/browser/views/download_started_animation_win.cc b/chrome/browser/views/download_started_animation_win.cc
index 84065e0..8f05c46 100644
--- a/chrome/browser/views/download_started_animation_win.cc
+++ b/chrome/browser/views/download_started_animation_win.cc
@@ -6,10 +6,10 @@
 
 #include "app/animation.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/rect.h"
 #include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
 #include "views/widget/widget_win.h"
diff --git a/chrome/browser/views/dropdown_bar_host.h b/chrome/browser/views/dropdown_bar_host.h
index 160e091..4d3d794 100644
--- a/chrome/browser/views/dropdown_bar_host.h
+++ b/chrome/browser/views/dropdown_bar_host.h
@@ -7,9 +7,9 @@
 
 #include "app/animation.h"
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/native_web_keyboard_event.h"
+#include "gfx/rect.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/focus/focus_manager.h"
 
diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h
index 5f1a458..02f5941 100644
--- a/chrome/browser/views/find_bar_host.h
+++ b/chrome/browser/views/find_bar_host.h
@@ -7,10 +7,10 @@
 
 #include "app/animation.h"
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/views/dropdown_bar_host.h"
+#include "gfx/rect.h"
 #include "views/controls/textfield/textfield.h"
 
 class BrowserView;
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index c57aa16..43f2bc3 100644
--- a/chrome/browser/views/find_bar_view.h
+++ b/chrome/browser/views/find_bar_view.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_
 
-#include "base/gfx/size.h"
 #include "base/string16.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/views/dropdown_bar_view.h"
+#include "gfx/size.h"
 #include "views/controls/button/button.h"
 #include "views/controls/textfield/textfield.h"
 
diff --git a/chrome/browser/views/frame/browser_extender.h b/chrome/browser/views/frame/browser_extender.h
index 03c27bd..5d096e4 100644
--- a/chrome/browser/views/frame/browser_extender.h
+++ b/chrome/browser/views/frame/browser_extender.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_EXTENDER_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 class BrowserView;
 
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 94322b2..6ba6f87 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -7,10 +7,10 @@
 
 #include <string>
 
-#include "base/gfx/size.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/dom_ui/html_dialog_tab_contents_delegate.h"
 #include "chrome/browser/views/dom_view.h"
+#include "gfx/size.h"
 #include "views/window/window_delegate.h"
 
 class Browser;
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index 3776c65..9c0e1fc 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "app/l10n_util.h"
-#include "base/gfx/point.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/pref_service.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/search_engines/template_url_table_model.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 6a3a383..11965fb 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "app/gfx/font.h"
-#include "base/gfx/rect.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/rect.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/chrome/browser/views/notifications/balloon_view.h b/chrome/browser/views/notifications/balloon_view.h
index 6d8da54..1e03be1 100644
--- a/chrome/browser/views/notifications/balloon_view.h
+++ b/chrome/browser/views/notifications/balloon_view.h
@@ -11,14 +11,14 @@
 #include "app/menus/simple_menu_model.h"
 #include "app/slide_animation.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/view_menu_delegate.h"
diff --git a/chrome/browser/views/options/exceptions_view.cc b/chrome/browser/views/options/exceptions_view.cc
index 5e01b95..a879444 100644
--- a/chrome/browser/views/options/exceptions_view.cc
+++ b/chrome/browser/views/options/exceptions_view.cc
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include "app/l10n_util.h"
-#include "base/gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "gfx/rect.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index 8b6ebaa..29a8226 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -8,8 +8,8 @@
 #include "app/gfx/skia_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/size.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index fbf8153..32b2703 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -11,10 +11,10 @@
 #include "app/l10n_util.h"
 #include "app/animation.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_theme_provider.h"
+#include "gfx/point.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h
index 78d3265..7952ea9 100644
--- a/chrome/browser/views/status_bubble_views.h
+++ b/chrome/browser/views/status_bubble_views.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_
 #define CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/status_bubble.h"
+#include "gfx/rect.h"
 
 class GURL;
 namespace gfx {
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
index 98f6800..91b25ce 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.cc
@@ -9,9 +9,6 @@
 
 #include "app/gfx/canvas_paint.h"
 #include "base/string_util.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/gtk/constrained_window_gtk.h"
@@ -25,6 +22,9 @@
 #include "chrome/browser/tab_contents/web_drag_dest_gtk.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_gtk.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/view_storage.h"
 #include "views/screen.h"
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
index cf0916e..3439ec5 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
+++ b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
@@ -1,15 +1,15 @@
-// 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 
 #include <vector>
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "gfx/size.h"
 #include "views/widget/widget_gtk.h"
 
 class ConstrainedWindowGtk;
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.h b/chrome/browser/views/tab_contents/tab_contents_view_win.h
index dc1e257..61177bc 100644
--- a/chrome/browser/views/tab_contents/tab_contents_view_win.h
+++ b/chrome/browser/views/tab_contents/tab_contents_view_win.h
@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 #define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "gfx/size.h"
 #include "views/widget/widget_win.h"
 
 class RenderViewContextMenuWin;
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index 5ebe6e3..758b076 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
 #define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
 
-#include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "chrome/browser/dock_info.h"
@@ -13,6 +12,7 @@
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab_renderer.h"
 #include "chrome/common/notification_registrar.h"
+#include "gfx/rect.h"
 
 namespace views {
 class MouseEvent;
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
index 6ae7df7..8e770e2 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ b/chrome/browser/views/tabs/dragged_tab_view.h
@@ -7,10 +7,10 @@
 
 #include "app/slide_animation.h"
 #include "base/callback.h"
-#include "base/gfx/point.h"
-#include "base/gfx/size.h"
 #include "base/task.h"
 #include "build/build_config.h"
+#include "gfx/point.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/view.h"
 
diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.cc b/chrome/browser/views/tabs/native_view_photobooth_win.cc
index 6f78ea9..da75fcc 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_win.cc
+++ b/chrome/browser/views/tabs/native_view_photobooth_win.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/views/tabs/native_view_photobooth_win.h"
 
 #include "app/gfx/canvas.h"
-#include "base/gfx/point.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "gfx/point.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/widget/widget_win.h"
 
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index 7d99ebd..bb822b8 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -11,10 +11,10 @@
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
-#include "base/gfx/size.h"
 #include "chrome/browser/tab_menu_model.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/tooltip_manager.h"
diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc
index 851727a..0fb56ce 100644
--- a/chrome/browser/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/views/tabs/tab_dragging_test.cc
@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
@@ -14,6 +13,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index 78208ae..2e309c6 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -6,9 +6,9 @@
 #define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_H__
 
 #include "app/animation.h"
-#include "base/gfx/point.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
+#include "gfx/point.h"
 #include "views/controls/button/image_button.h"
 #include "views/view.h"
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 0b8cb4b..a8fd5f7 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -11,7 +11,6 @@
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#include "base/gfx/size.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
@@ -24,6 +23,7 @@
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/image_view.h"
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index a0c0aeb..6285e1d 100644
--- a/chrome/browser/views/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.h
@@ -5,11 +5,11 @@
 #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 #define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/base_tab_strip.h"
 #include "chrome/browser/views/tabs/tab.h"
+#include "gfx/point.h"
 #include "views/controls/button/image_button.h"
 
 class DraggedTabController;
diff --git a/chrome/browser/window_sizer.h b/chrome/browser/window_sizer.h
index f9c486a..3981acb 100644
--- a/chrome/browser/window_sizer.h
+++ b/chrome/browser/window_sizer.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 class Browser;
 
diff --git a/chrome/common/accelerated_surface_mac.cc b/chrome/common/accelerated_surface_mac.cc
index d12ecb6..0e74428 100644
--- a/chrome/common/accelerated_surface_mac.cc
+++ b/chrome/common/accelerated_surface_mac.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/common/accelerated_surface_mac.h"
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/common/io_surface_support_mac.h"
+#include "gfx/rect.h"
 
 AcceleratedSurface::AcceleratedSurface()
     : gl_context_(NULL),
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index d767aef..7cb9c8a 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/common/common_param_traits.h"
 
-#include "base/gfx/rect.h"
 #include "chrome/common/chrome_constants.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #ifndef EXCLUDE_SKIA_DEPENDENCIES
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 963c4b96..b40d6fb 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -9,9 +9,9 @@
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/rect.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "gfx/rect.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
diff --git a/chrome/common/gpu_messages.h b/chrome/common/gpu_messages.h
index 1bf9bac..4553bdc 100644
--- a/chrome/common/gpu_messages.h
+++ b/chrome/common/gpu_messages.h
@@ -10,11 +10,11 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/process.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/gpu_native_window_handle.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 
 namespace IPC {
diff --git a/chrome/common/plugin_messages.h b/chrome/common/plugin_messages.h
index b195f5c..ba46044 100644
--- a/chrome/common/plugin_messages.h
+++ b/chrome/common/plugin_messages.h
@@ -14,10 +14,10 @@
 #include <vector>
 
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/rect.h"
 #include "base/basictypes.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/webkit_param_traits.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/npapi/bindings/npapi.h"
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index 7d126dc..6b5ff3c 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -14,7 +14,6 @@
 
 #include "base/file_path.h"
 #include "base/nullable_string16.h"
-#include "base/gfx/rect.h"
 #include "base/sync_socket.h"
 #include "base/values.h"
 #include "chrome/common/content_settings.h"
@@ -23,6 +22,7 @@
 #include "chrome/common/nacl_types.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/page_zoom.h"
+#include "gfx/rect.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
@@ -951,7 +951,7 @@ IPC_BEGIN_MESSAGES(View)
   // incognito mode.
   IPC_MESSAGE_CONTROL1(ViewMsg_SetIsIncognitoProcess,
                        bool /* is_incognito_processs */)
-                      
+
 IPC_END_MESSAGES(View)
 
 
diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc
index 02f0042..5b48dab 100644
--- a/chrome/common/security_filter_peer.cc
+++ b/chrome/common/security_filter_peer.cc
@@ -7,8 +7,8 @@
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/size.h"
 #include "base/string_util.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/common/transport_dib_linux.cc b/chrome/common/transport_dib_linux.cc
index d3ffe69..9b153af 100644
--- a/chrome/common/transport_dib_linux.cc
+++ b/chrome/common/transport_dib_linux.cc
@@ -7,10 +7,10 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/common/x11_util.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 
 // The shmat system call uses this as it's invalid return address
diff --git a/chrome/common/x11_util.cc b/chrome/common/x11_util.cc
index 27eb2d4..8d052c6 100644
--- a/chrome/common/x11_util.cc
+++ b/chrome/common/x11_util.cc
@@ -20,9 +20,9 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/gfx/size.h"
 #include "base/thread.h"
 #include "chrome/common/x11_util_internal.h"
+#include "gfx/size.h"
 
 namespace x11_util {
 
diff --git a/chrome/common/x11_util.h b/chrome/common/x11_util.h
index 02285f4..2ee111c 100644
--- a/chrome/common/x11_util.h
+++ b/chrome/common/x11_util.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/rect.h"
 #include "base/task.h"
+#include "gfx/rect.h"
 
 typedef struct _GdkDrawable GdkWindow;
 typedef struct _GtkWidget GtkWidget;
diff --git a/chrome/gpu/gpu_backing_store_glx_context.h b/chrome/gpu/gpu_backing_store_glx_context.h
index 393cd92..006d791 100644
--- a/chrome/gpu/gpu_backing_store_glx_context.h
+++ b/chrome/gpu/gpu_backing_store_glx_context.h
@@ -6,8 +6,8 @@
 #define CHROME_GPU_GPU_BACKING_STORE_GLX_CONTEXT_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
 #include "chrome/gpu/x_util.h"
+#include "gfx/size.h"
 
 class GpuThread;
 
diff --git a/chrome/gpu/gpu_backing_store_win.h b/chrome/gpu/gpu_backing_store_win.h
index ba7cf0c..14fe9ce 100644
--- a/chrome/gpu/gpu_backing_store_win.h
+++ b/chrome/gpu/gpu_backing_store_win.h
@@ -11,8 +11,8 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/size.h"
 #include "ipc/ipc_channel.h"
 
 class GpuThread;
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index ecc4b8f..8ec442b 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -9,12 +9,12 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/plugin/command_buffer_stub.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npapi.h"
diff --git a/chrome/renderer/media/ipc_video_renderer.h b/chrome/renderer/media/ipc_video_renderer.h
index ad16265..62fe048 100644
--- a/chrome/renderer/media/ipc_video_renderer.h
+++ b/chrome/renderer/media/ipc_video_renderer.h
@@ -10,10 +10,10 @@
 #ifndef CHROME_RENDERER_MEDIA_IPC_VIDEO_RENDERER_H_
 #define CHROME_RENDERER_MEDIA_IPC_VIDEO_RENDERER_H_
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/waitable_event.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "ipc/ipc_message.h"
 #include "media/filters/video_renderer_base.h"
 #include "webkit/glue/media/web_video_renderer.h"
diff --git a/chrome/renderer/mock_render_process.cc b/chrome/renderer/mock_render_process.cc
index a71fcab..ed375ae 100644
--- a/chrome/renderer/mock_render_process.cc
+++ b/chrome/renderer/mock_render_process.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/renderer/mock_render_process.h"
 
-#include "base/gfx/rect.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/rect.h"
 
 MockRenderProcess::MockRenderProcess()
     : transport_dib_next_sequence_number_(0) {
diff --git a/chrome/renderer/paint_aggregator.h b/chrome/renderer/paint_aggregator.h
index 9a595be..946e0cb 100644
--- a/chrome/renderer/paint_aggregator.h
+++ b/chrome/renderer/paint_aggregator.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 // This class is responsible for aggregating multiple invalidation and scroll
 // commands to produce a scroll and repaint sequence.
diff --git a/chrome/renderer/pepper_devices.h b/chrome/renderer/pepper_devices.h
index cf14133..229b2ec 100644
--- a/chrome/renderer/pepper_devices.h
+++ b/chrome/renderer/pepper_devices.h
@@ -6,14 +6,13 @@
 #define CHROME_RENDERER_PEPPER_DEVICES_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/simple_thread.h"
-#include "base/gfx/rect.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/audio_message_filter.h"
+#include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 45d174b..f80c507 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "gfx/size.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
 
 namespace gfx {
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 09fcb20..8c7f5c4 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -5,10 +5,10 @@
 #include "chrome/renderer/print_web_view_helper.h"
 
 #include "app/l10n_util.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "printing/native_metafile.h"
 #include "skia/ext/vector_canvas.h"
diff --git a/chrome/renderer/render_process_unittest.cc b/chrome/renderer/render_process_unittest.cc
index f52d694..e99e44a 100644
--- a/chrome/renderer/render_process_unittest.cc
+++ b/chrome/renderer/render_process_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/rect.h"
 #include "base/sys_info.h"
 #include "base/string_util.h"
 #include "chrome/renderer/render_process_impl.h"
+#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 0cfc4d1..66ff242 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -13,8 +13,6 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "base/id_map.h"
 #include "base/linked_ptr.h"
 #include "base/shared_memory.h"
@@ -42,6 +40,8 @@
 #include "chrome/renderer/renderer_webcookiejar_impl.h"
 #include "chrome/renderer/translate/page_translator.h"
 #include "chrome/renderer/translate/text_translator_impl.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 0096683..686862f 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -5,8 +5,6 @@
 #include "chrome/renderer/render_widget.h"
 
 #include "base/command_line.h"
-#include "base/gfx/point.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
@@ -16,6 +14,8 @@
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
+#include "gfx/point.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 584930d..835d44f 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -9,14 +9,14 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "chrome/renderer/gpu_channel_host.h"
 #include "chrome/renderer/paint_aggregator.h"
 #include "chrome/renderer/render_process.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_handle.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h
index 5c1b22f..a7bb85e 100644
--- a/chrome/renderer/webplugin_delegate_pepper.h
+++ b/chrome/renderer/webplugin_delegate_pepper.h
@@ -14,13 +14,13 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
 #include "base/id_map.h"
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "base/weak_ptr.h"
 #include "chrome/renderer/pepper_devices.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/command_buffer_proxy.h"
+#include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webplugin_delegate.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 5c51b35..eb596ff 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -20,7 +20,6 @@
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
-#include "base/gfx/size.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
@@ -30,6 +29,7 @@
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "net/base/mime_util.h"
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 71b7b6f..a51f678 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -10,11 +10,11 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/plugin_channel_host.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index a12a5fc..884110b 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
@@ -11,6 +9,8 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "views/event.h"
 
 AutomatedUITestBase::AutomatedUITestBase() {}
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index e6911c0..42d4731 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -8,11 +8,11 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/security_style.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/test/automation/automation_constants.h"
+#include "gfx/rect.h"
 #include "net/base/upload_data.h"
 
 
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index c01df68..8dcf03a 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "base/string16.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index d31fdbf..4c08fe2 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -10,7 +10,6 @@
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
-#include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
@@ -29,6 +28,7 @@
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui_test_utils.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/rect.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc
index 2411dd6..08759a9 100644
--- a/chrome/test/automation/browser_proxy.cc
+++ b/chrome/test/automation/browser_proxy.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "base/gfx/point.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/time.h"
@@ -16,6 +15,7 @@
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "gfx/point.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
diff --git a/chrome/test/automation/window_proxy.cc b/chrome/test/automation/window_proxy.cc
index 1a8f56b..65d6cf4 100644
--- a/chrome/test/automation/window_proxy.cc
+++ b/chrome/test/automation/window_proxy.cc
@@ -7,13 +7,13 @@
 #include <vector>
 #include <algorithm>
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 bool WindowProxy::SimulateOSClick(const gfx::Point& click, int flags) {
diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index 55b331e..31f1b1f 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/file_util.h"
-#include "base/gfx/rect.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
@@ -14,6 +13,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/rect.h"
 #include "net/base/net_util.h"
 
 using base::TimeDelta;
diff --git a/chrome/test/ui/fast_shutdown_uitest.cc b/chrome/test/ui/fast_shutdown_uitest.cc
index ef8f8c6..fd4159e 100644
--- a/chrome/test/ui/fast_shutdown_uitest.cc
+++ b/chrome/test/ui/fast_shutdown_uitest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "app/message_box_flags.h"
-#include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/test/ui/ui_test.h"
@@ -11,6 +10,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "gfx/rect.h"
 #include "views/event.h"
 
 class FastShutdown : public UITest {
diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc
index 3a65d4f..522c221 100644
--- a/chrome/test/ui/history_uitest.cc
+++ b/chrome/test/ui/history_uitest.cc
@@ -1,43 +1,18 @@
-// Copyright 2008, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 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.
 
 // History UI tests
 
 #include "base/file_util.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
 
diff --git a/chrome/test/ui/mouseleave_uitest.cc b/chrome/test/ui/mouseleave_uitest.cc
index 8cb59c2..937cd5a 100644
--- a/chrome/test/ui/mouseleave_uitest.cc
+++ b/chrome/test/ui/mouseleave_uitest.cc
@@ -4,8 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ -17,6 +15,8 @@
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index 6b88ab6..0af6121 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -17,6 +17,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
+        'rect_unittest.cc',
         'run_all_unittests.cc',
         'test_suite.h',
       ],
@@ -54,6 +55,12 @@
       'sources': [
         'gfx_paths.cc',
         'gfx_paths.h',
+        'point.cc',
+        'point.h',
+        'rect.cc',
+        'rect.h',
+        'size.cc',
+        'size.h',
       ],
       'conditions': [
         ['OS=="win"', {
diff --git a/gfx/icon_util.cc b/gfx/icon_util.cc
index f26ab95..b3b89a8 100644
--- a/gfx/icon_util.cc
+++ b/gfx/icon_util.cc
@@ -5,10 +5,10 @@
 #include "gfx/icon_util.h"
 
 #include "base/file_util.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
+#include "gfx/size.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/gfx/icon_util_unittest.cc b/gfx/icon_util_unittest.cc
index f7f9786..26ecffd 100644
--- a/gfx/icon_util_unittest.cc
+++ b/gfx/icon_util_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "gfx/gfx_paths.h"
 #include "gfx/icon_util.h"
+#include "gfx/size.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/gfx/point.cc b/gfx/point.cc
index 05b7596..16a8216 100644
--- a/base/gfx/point.cc
+++ b/gfx/point.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/gfx/point.h b/gfx/point.h
new file mode 100644
index 0000000..513d555
--- /dev/null
+++ b/gfx/point.h
@@ -0,0 +1,80 @@
+// Copyright (c) 2006-2008 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 BASE_GFX_POINT_H__
+#define BASE_GFX_POINT_H__
+
+#include "build/build_config.h"
+
+#include <iosfwd>
+
+#if defined(OS_WIN)
+typedef unsigned long DWORD;
+typedef struct tagPOINT POINT;
+#elif defined(OS_MACOSX)
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+namespace gfx {
+
+//
+// A point has an x and y coordinate.
+//
+class Point {
+ public:
+  Point();
+  Point(int x, int y);
+#if defined(OS_WIN)
+  // |point| is a DWORD value that contains a coordinate.  The x-coordinate is
+  // the low-order short and the y-coordinate is the high-order short.  This
+  // value is commonly acquired from GetMessagePos/GetCursorPos.
+  explicit Point(DWORD point);
+  explicit Point(const POINT& point);
+  Point& operator=(const POINT& point);
+#elif defined(OS_MACOSX)
+  explicit Point(const CGPoint& point);
+#endif
+
+  ~Point() {}
+
+  int x() const { return x_; }
+  int y() const { return y_; }
+
+  void SetPoint(int x, int y) {
+    x_ = x;
+    y_ = y;
+  }
+
+  void set_x(int x) { x_ = x; }
+  void set_y(int y) { y_ = y; }
+
+  void Offset(int delta_x, int delta_y) {
+    x_ += delta_x;
+    y_ += delta_y;
+  }
+
+  bool operator==(const Point& rhs) const {
+    return x_ == rhs.x_ && y_ == rhs.y_;
+  }
+
+  bool operator!=(const Point& rhs) const {
+    return !(*this == rhs);
+  }
+
+#if defined(OS_WIN)
+  POINT ToPOINT() const;
+#elif defined(OS_MACOSX)
+  CGPoint ToCGPoint() const;
+#endif
+
+ private:
+  int x_;
+  int y_;
+};
+
+}  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Point& p);
+
+#endif  // BASE_GFX_POINT_H__
diff --git a/base/gfx/rect.cc b/gfx/rect.cc
index a3c6712..30338f4 100644
--- a/base/gfx/rect.cc
+++ b/gfx/rect.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/gfx/rect.h b/gfx/rect.h
new file mode 100644
index 0000000..c3c01ad
--- /dev/null
+++ b/gfx/rect.h
@@ -0,0 +1,165 @@
+// 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.
+
+// Defines a simple integer rectangle class.  The containment semantics
+// are array-like; that is, the coordinate (x, y) is considered to be
+// contained by the rectangle, but the coordinate (x + width, y) is not.
+// The class will happily let you create malformed rectangles (that is,
+// rectangles with negative width and/or height), but there will be assertions
+// in the operations (such as contain()) to complain in this case.
+
+#ifndef BASE_GFX_RECT_H__
+#define BASE_GFX_RECT_H__
+
+#include <iosfwd>
+
+#include "base/gfx/point.h"
+#include "base/gfx/size.h"
+
+#if defined(OS_WIN)
+typedef struct tagRECT RECT;
+#elif defined(USE_X11)
+typedef struct _GdkRectangle GdkRectangle;
+#endif
+
+namespace gfx {
+
+class Rect {
+ public:
+  Rect();
+  Rect(int width, int height);
+  Rect(int x, int y, int width, int height);
+#if defined(OS_WIN)
+  explicit Rect(const RECT& r);
+#elif defined(OS_MACOSX)
+  explicit Rect(const CGRect& r);
+#elif defined(USE_X11)
+  explicit Rect(const GdkRectangle& r);
+#endif
+  Rect(const gfx::Point& origin, const gfx::Size& size);
+
+  ~Rect() {}
+
+#if defined(OS_WIN)
+  Rect& operator=(const RECT& r);
+#elif defined(OS_MACOSX)
+  Rect& operator=(const CGRect& r);
+#elif defined(USE_X11)
+  Rect& operator=(const GdkRectangle& r);
+#endif
+
+  int x() const { return origin_.x(); }
+  void set_x(int x) { origin_.set_x(x); }
+
+  int y() const { return origin_.y(); }
+  void set_y(int y) { origin_.set_y(y); }
+
+  int width() const { return size_.width(); }
+  void set_width(int width);
+
+  int height() const { return size_.height(); }
+  void set_height(int height);
+
+  const gfx::Point& origin() const { return origin_; }
+  void set_origin(const gfx::Point& origin) { origin_ = origin; }
+
+  const gfx::Size& size() const { return size_; }
+  void set_size(const gfx::Size& size) { size_ = size; }
+
+  int right() const { return x() + width(); }
+  int bottom() const { return y() + height(); }
+
+  void SetRect(int x, int y, int width, int height);
+
+  // Shrink the rectangle by a horizontal and vertical distance on all sides.
+  void Inset(int horizontal, int vertical) {
+    Inset(horizontal, vertical, horizontal, vertical);
+  }
+
+  // Shrink the rectangle by the specified amount on each side.
+  void Inset(int left, int top, int right, int bottom);
+
+  // Move the rectangle by a horizontal and vertical distance.
+  void Offset(int horizontal, int vertical);
+  void Offset(const gfx::Point& point) {
+    Offset(point.x(), point.y());
+  }
+
+  // Returns true if the area of the rectangle is zero.
+  bool IsEmpty() const { return size_.IsEmpty(); }
+
+  bool operator==(const Rect& other) const;
+
+  bool operator!=(const Rect& other) const {
+    return !(*this == other);
+  }
+
+#if defined(OS_WIN)
+  // Construct an equivalent Win32 RECT object.
+  RECT ToRECT() const;
+#elif defined(USE_X11)
+  GdkRectangle ToGdkRectangle() const;
+#elif defined(OS_MACOSX)
+  // Construct an equivalent CoreGraphics object.
+  CGRect ToCGRect() const;
+#endif
+
+  // Returns true if the point identified by point_x and point_y falls inside
+  // this rectangle.  The point (x, y) is inside the rectangle, but the
+  // point (x + width, y + height) is not.
+  bool Contains(int point_x, int point_y) const;
+
+  // Returns true if the specified point is contained by this rectangle.
+  bool Contains(const gfx::Point& point) const {
+    return Contains(point.x(), point.y());
+  }
+
+  // Returns true if this rectangle contains the specified rectangle.
+  bool Contains(const Rect& rect) const;
+
+  // Returns true if this rectangle intersects the specified rectangle.
+  bool Intersects(const Rect& rect) const;
+
+  // Computes the intersection of this rectangle with the given rectangle.
+  Rect Intersect(const Rect& rect) const;
+
+  // Computes the union of this rectangle with the given rectangle.  The union
+  // is the smallest rectangle containing both rectangles.
+  Rect Union(const Rect& rect) const;
+
+  // Computes the rectangle resulting from subtracting |rect| from |this|.  If
+  // |rect| does not intersect completely in either the x- or y-direction, then
+  // |*this| is returned.  If |rect| contains |this|, then an empty Rect is
+  // returned.
+  Rect Subtract(const Rect& rect) const;
+
+  // Returns true if this rectangle equals that of the supplied rectangle.
+  bool Equals(const Rect& rect) const {
+    return *this == rect;
+  }
+
+  // Fits as much of the receiving rectangle into the supplied rectangle as
+  // possible, returning the result. For example, if the receiver had
+  // a x-location of 2 and a width of 4, and the supplied rectangle had
+  // an x-location of 0 with a width of 5, the returned rectangle would have
+  // an x-location of 1 with a width of 4.
+  Rect AdjustToFit(const Rect& rect) const;
+
+  // Returns the center of this rectangle.
+  Point CenterPoint() const;
+
+  // Returns true if this rectangle shares an entire edge (i.e., same width or
+  // same height) with the given rectangle, and the rectangles do not overlap.
+  bool SharesEdgeWith(const gfx::Rect& rect) const;
+
+ private:
+  gfx::Point origin_;
+  gfx::Size size_;
+};
+
+}  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Rect& r);
+
+#endif  // BASE_GFX_RECT_H__
diff --git a/base/gfx/rect_unittest.cc b/gfx/rect_unittest.cc
index 3562883..f5b4d9b 100644
--- a/base/gfx/rect_unittest.cc
+++ b/gfx/rect_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef testing::Test RectTest;
diff --git a/base/gfx/size.cc b/gfx/size.cc
index 91f39c0..d450f20 100644
--- a/base/gfx/size.cc
+++ b/gfx/size.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/gfx/size.h b/gfx/size.h
new file mode 100644
index 0000000..896908e8
--- /dev/null
+++ b/gfx/size.h
@@ -0,0 +1,83 @@
+// Copyright (c) 2006-2008 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 BASE_GFX_SIZE_H_
+#define BASE_GFX_SIZE_H_
+
+#include "build/build_config.h"
+
+#include <iosfwd>
+
+#if defined(OS_WIN)
+typedef struct tagSIZE SIZE;
+#elif defined(OS_MACOSX)
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+namespace gfx {
+
+//
+// A size has width and height values.
+//
+class Size {
+ public:
+  Size() : width_(0), height_(0) {}
+  Size(int width, int height);
+#if defined(OS_MACOSX)
+  explicit Size(const CGSize& s);
+#endif
+
+  ~Size() {}
+
+#if defined(OS_MACOSX)
+  Size& operator=(const CGSize& s);
+#endif
+
+  int width() const { return width_; }
+  int height() const { return height_; }
+
+  int GetArea() const { return width_ * height_; }
+
+  void SetSize(int width, int height) {
+    set_width(width);
+    set_height(height);
+  }
+
+  void Enlarge(int width, int height) {
+    set_width(width_ + width);
+    set_height(height_ + height);
+  }
+
+  void set_width(int width);
+  void set_height(int height);
+
+  bool operator==(const Size& s) const {
+    return width_ == s.width_ && height_ == s.height_;
+  }
+
+  bool operator!=(const Size& s) const {
+    return !(*this == s);
+  }
+
+  bool IsEmpty() const {
+    // Size doesn't allow negative dimensions, so testing for 0 is enough.
+    return (width_ == 0) || (height_ == 0);
+  }
+
+#if defined(OS_WIN)
+  SIZE ToSIZE() const;
+#elif defined(OS_MACOSX)
+  CGSize ToCGSize() const;
+#endif
+
+ private:
+  int width_;
+  int height_;
+};
+
+}  // namespace gfx
+
+std::ostream& operator<<(std::ostream& out, const gfx::Size& s);
+
+#endif  // BASE_GFX_SIZE_H_
diff --git a/printing/DEPS b/printing/DEPS
index 64b2aab..cfb3f60 100644
--- a/printing/DEPS
+++ b/printing/DEPS
@@ -2,5 +2,6 @@ include_rules = [
   "+app/gfx",  # Font's are here.
   "+app",  # win_util::FormatSystemTime/Date.
   "+base",
+  "+gfx",
   "+skia/ext",
 ]
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 62cc4a0..0a733af 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -7,11 +7,11 @@
 #include "app/gfx/codec/jpeg_codec.h"
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/gdi_util.h"
-#include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
+#include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace printing {
diff --git a/printing/image.cc b/printing/image.cc
index 9ead5e0..685e9bd 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -6,9 +6,9 @@
 
 #include "app/gfx/codec/png_codec.h"
 #include "base/file_util.h"
-#include "base/gfx/rect.h"
 #include "base/md5.h"
 #include "base/string_util.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_WIN)
diff --git a/printing/image.h b/printing/image.h
index f8755275..ed2820b 100644
--- a/printing/image.h
+++ b/printing/image.h
@@ -10,8 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
+#include "gfx/size.h"
 #include "printing/native_metafile.h"
 
 namespace printing {
diff --git a/printing/page_setup.h b/printing/page_setup.h
index 2ae984b..a661fdb 100644
--- a/printing/page_setup.h
+++ b/printing/page_setup.h
@@ -5,7 +5,7 @@
 #ifndef PRINTING_PAGE_SETUP_H_
 #define PRINTING_PAGE_SETUP_H_
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 namespace printing {
 
diff --git a/printing/pdf_metafile_mac.cc b/printing/pdf_metafile_mac.cc
index ef2098c..54da147 100644
--- a/printing/pdf_metafile_mac.cc
+++ b/printing/pdf_metafile_mac.cc
@@ -5,10 +5,10 @@
 #include "printing/pdf_metafile_mac.h"
 
 #include "base/file_path.h"
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
+#include "gfx/rect.h"
 
 namespace printing {
 
diff --git a/printing/pdf_metafile_mac_unittest.cc b/printing/pdf_metafile_mac_unittest.cc
index 88f5c8f..fdf833c 100644
--- a/printing/pdf_metafile_mac_unittest.cc
+++ b/printing/pdf_metafile_mac_unittest.cc
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(PdfMetafileTest, Pdf) {
diff --git a/printing/print_settings.h b/printing/print_settings.h
index b5bb723..3a269f7 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -5,7 +5,7 @@
 #ifndef PRINTING_PRINT_SETTINGS_H_
 #define PRINTING_PRINT_SETTINGS_H_
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "printing/page_overlays.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
diff --git a/printing/printed_page.h b/printing/printed_page.h
index cbc9e01..f7d2f7d 100644
--- a/printing/printed_page.h
+++ b/printing/printed_page.h
@@ -5,10 +5,10 @@
 #ifndef PRINTING_PRINTED_PAGE_H_
 #define PRINTING_PRINTED_PAGE_H_
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "printing/native_metafile.h"
 
 namespace printing {
diff --git a/tools/memory_watcher/DEPS b/tools/memory_watcher/DEPS
index 0d72e09..54348df 100644
--- a/tools/memory_watcher/DEPS
+++ b/tools/memory_watcher/DEPS
@@ -1,3 +1,4 @@
 include_rules = [
   "+app",
+  "+gfx",
 ]
diff --git a/tools/memory_watcher/hotkey.h b/tools/memory_watcher/hotkey.h
index c0d0938..8989fef 100644
--- a/tools/memory_watcher/hotkey.h
+++ b/tools/memory_watcher/hotkey.h
@@ -5,7 +5,7 @@
 #ifndef TOOLS_MEMORY_WATCHER_HOTKEY_H_
 #define TOOLS_MEMORY_WATCHER_HOTKEY_H_
 
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "app/win/window_impl.h"
 
 // HotKey handler.
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"
diff --git a/webkit/DEPS b/webkit/DEPS
index 5e889ab..113d8488 100644
--- a/webkit/DEPS
+++ b/webkit/DEPS
@@ -6,6 +6,7 @@ skip_child_includes = [
 include_rules = [
   # For bridge/c/c_utility.h in npruntime_util.cc
   "+bridge",
+  "+gfx",
   "+grit",  # For generated headers
   "+third_party/sqlite",
   "+third_party/tcmalloc",
diff --git a/webkit/glue/dom_operations.h b/webkit/glue/dom_operations.h
index 2156b31..62222c6 100644
--- a/webkit/glue/dom_operations.h
+++ b/webkit/glue/dom_operations.h
@@ -9,7 +9,7 @@
 #include <map>
 #include <vector>
 
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/password_form_dom_manager.h"
 
diff --git a/webkit/glue/image_decoder.h b/webkit/glue/image_decoder.h
index b2f9b0d..330ea90 100644
--- a/webkit/glue/image_decoder.h
+++ b/webkit/glue/image_decoder.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 
 class SkBitmap;
 
diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc
index ae16c03..6185834 100644
--- a/webkit/glue/image_resource_fetcher.cc
+++ b/webkit/glue/image_resource_fetcher.cc
@@ -5,7 +5,7 @@
 #include "webkit/glue/image_resource_fetcher.h"
 
 #include "base/callback.h"
-#include "base/gfx/size.h"
+#include "gfx/size.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "webkit/glue/image_decoder.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/webkit/glue/media/video_renderer_impl.h b/webkit/glue/media/video_renderer_impl.h
index 4bc7210..b2018e9 100644
--- a/webkit/glue/media/video_renderer_impl.h
+++ b/webkit/glue/media/video_renderer_impl.h
@@ -1,6 +1,6 @@
-// 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.
 //
 // The video renderer implementation to be use by the media pipeline. It lives
 // inside video renderer thread and also WebKit's main thread. We need to be
@@ -10,8 +10,8 @@
 #ifndef WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
 #define WEBKIT_GLUE_MEDIA_VIDEO_RENDERER_IMPL_H_
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "media/base/buffers.h"
 #include "media/base/filters.h"
 #include "media/filters/video_renderer_base.h"
diff --git a/webkit/glue/plugins/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h
index d3f0374..3e689c4 100644
--- a/webkit/glue/plugins/plugin_instance.h
+++ b/webkit/glue/plugins/plugin_instance.h
@@ -17,10 +17,10 @@
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "gfx/point.h"
+#include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h
index 81e6874..e4913f0 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl.h
+++ b/webkit/glue/plugins/webplugin_delegate_impl.h
@@ -13,10 +13,10 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
-#include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "base/timer.h"
+#include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webplugin_delegate.h"
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index e7cc413..293bd74 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -6,8 +6,8 @@
 #define WEBKIT_GLUE_WEBCURSOR_H_
 
 #include "base/basictypes.h"
-#include "base/gfx/point.h"
-#include "base/gfx/size.h"
+#include "gfx/point.h"
+#include "gfx/size.h"
 
 #include <vector>
 
diff --git a/webkit/glue/webmediaplayer_impl.h b/webkit/glue/webmediaplayer_impl.h
index 3315119e..3e42793 100644
--- a/webkit/glue/webmediaplayer_impl.h
+++ b/webkit/glue/webmediaplayer_impl.h
@@ -55,11 +55,11 @@
 
 #include <vector>
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_impl.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/webkit/glue/webplugin.h b/webkit/glue/webplugin.h
index 3f9c7e5..1bd6c61 100644
--- a/webkit/glue/webplugin.h
+++ b/webkit/glue/webplugin.h
@@ -10,7 +10,7 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 
 // TODO(port): this typedef is obviously incorrect on non-Windows
 // platforms, but now a lot of code now accidentally depends on them
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index e797676..34b8261 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/rect.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/webkit/tools/test_shell/event_sending_controller.h b/webkit/tools/test_shell/event_sending_controller.h
index a133ba2..22a2a08 100644
--- a/webkit/tools/test_shell/event_sending_controller.h
+++ b/webkit/tools/test_shell/event_sending_controller.h
@@ -17,7 +17,7 @@
 #define WEBKIT_TOOLS_TEST_SHELL_EVENT_SENDING_CONTROLLER_H_
 
 #include "build/build_config.h"
-#include "base/gfx/point.h"
+#include "gfx/point.h"
 #include "base/task.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
diff --git a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc b/webkit/tools/test_shell/mac/accelerated_surface_stub.cc
index f331a41..c983de5 100644
--- a/webkit/tools/test_shell/mac/accelerated_surface_stub.cc
+++ b/webkit/tools/test_shell/mac/accelerated_surface_stub.cc
@@ -13,8 +13,8 @@
 #include <OpenGL/OpenGL.h>
 
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
 
 class TransportDIB {
  public:
diff --git a/webkit/tools/test_shell/mac/test_shell_webview.mm b/webkit/tools/test_shell/mac/test_shell_webview.mm
index f474685..01f9242 100644
--- a/webkit/tools/test_shell/mac/test_shell_webview.mm
+++ b/webkit/tools/test_shell/mac/test_shell_webview.mm
@@ -6,9 +6,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "gfx/rect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/tools/test_shell/test_shell.h"
diff --git a/webkit/tools/test_shell/mac/webview_host.mm b/webkit/tools/test_shell/mac/webview_host.mm
index ba62c0d..1d7af4d 100644
--- a/webkit/tools/test_shell/mac/webview_host.mm
+++ b/webkit/tools/test_shell/mac/webview_host.mm
@@ -7,8 +7,8 @@
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/mac/test_shell_webview.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index b447f96..12c202e1 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -6,9 +6,9 @@
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h"
 #include "third_party/WebKit/WebKit/chromium/public/mac/WebScreenInfoFactory.h"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 533b87e..74b1fef 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -12,7 +12,6 @@
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/size.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
@@ -22,6 +21,7 @@
 #include "base/stats_table.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "gfx/size.h"
 #include "googleurl/src/url_util.h"
 #include "grit/webkit_strings.h"
 #include "net/base/mime_util.h"
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 608f959..923b5b0 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -14,7 +14,6 @@
 #include "base/debug_on_start.h"
 #include "base/debug_util.h"
 #include "base/file_util.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/memory_debug.h"
@@ -24,6 +23,7 @@
 #include "base/string16.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/size.h"
 #include "grit/webkit_resources.h"
 #include "net/base/mime_util.h"
 #include "skia/ext/bitmap_platform_device.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 17c976b..a03569c 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -10,11 +10,11 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/file_util.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/point.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebConsoleMessage.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 6a33c50..63166ee 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -10,11 +10,11 @@
 #include <gdk/gdkx.h>
 
 #include "app/gfx/gtk_util.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/point.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 11c8732..d37485f 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -14,10 +14,10 @@
 
 #include "app/gfx/gdi_util.h"
 #include "app/gfx/native_widget_types.h"
-#include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/point.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
diff --git a/webkit/tools/test_shell/webview_host.h b/webkit/tools/test_shell/webview_host.h
index ed783dd..f73483f 100644
--- a/webkit/tools/test_shell/webview_host.h
+++ b/webkit/tools/test_shell/webview_host.h
@@ -9,7 +9,7 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
+#include "gfx/rect.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #if defined(TOOLKIT_USES_GTK)
diff --git a/webkit/tools/test_shell/webview_host_gtk.cc b/webkit/tools/test_shell/webview_host_gtk.cc
index 2302af5..177b921 100644
--- a/webkit/tools/test_shell/webview_host_gtk.cc
+++ b/webkit/tools/test_shell/webview_host_gtk.cc
@@ -7,8 +7,8 @@
 #include "webkit/tools/test_shell/webview_host.h"
 
 #include "base/logging.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/plugins/gtk_plugin_container.h"
diff --git a/webkit/tools/test_shell/webview_host_win.cc b/webkit/tools/test_shell/webview_host_win.cc
index 723dc31..3c2e9a8 100644
--- a/webkit/tools/test_shell/webview_host_win.cc
+++ b/webkit/tools/test_shell/webview_host_win.cc
@@ -4,9 +4,9 @@
 
 #include "webkit/tools/test_shell/webview_host.h"
 
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
 #include "base/win_util.h"
+#include "gfx/rect.h"
+#include "gfx/size.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 2ceeaba..093313c 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -7,8 +7,8 @@
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
-#include "base/gfx/rect.h"
 #include "base/scoped_ptr.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace gfx {
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 6ecfcee..85dc27c 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved...........
+// 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 "webkit/tools/test_shell/webwidget_host.h"
 
-#include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupMenu.h"
author	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2010-03-14 23:30:59 +0000
committer	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2010-03-14 23:30:59 +0000
commit	e0fc2f1f81f13440af3bb4cf5e56a031f91fc163 (patch)
tree	c84d3625eac633ea78d68688ecd74e2d0a158334
parent	98af9aca7168f061bfaae5cd4f4eb3f7de4e70e7 (diff)
download	chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.zip chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.gz chromium_src-e0fc2f1f81f13440af3bb4cf5e56a031f91fc163.tar.bz2