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
Denger-Network · Mar 14, 2010 · e0fc2f1 · e0fc2f1
1 parent 98af9ac
commit e0fc2f1
Show file tree

Hide file tree

Showing 254 changed files with 656 additions and 344 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"