Move app/gfx/canvas and app/gfx/font to gfx/.

TBR=darin
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1132006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42312 0039d316-1c4b-4281-b951-d872f2087c98

app/app.gyp

@@ -39,7 +39,6 @@
       'sources': [
         'animation_unittest.cc',
         'clipboard/clipboard_unittest.cc',
-        'gfx/font_unittest.cc',
         'l10n_util_mac_unittest.mm',
         'l10n_util_unittest.cc',
         'os_exchange_data_win_unittest.cc',

app/app_base.gypi

@@ -112,18 +112,8 @@
         'drag_drop_types_win.cc',
         'drag_drop_types.h',
         'file_download_interface.h',
-        'gfx/canvas.cc',
-        'gfx/canvas.h',
-        'gfx/canvas_linux.cc',
-        'gfx/canvas_mac.mm',
-        'gfx/canvas_win.cc',
-        'gfx/font.h',
-        'gfx/font_gtk.cc',
-        'gfx/font_mac.mm',
-        'gfx/font_skia.cc',
         'gfx/font_util.h',
         'gfx/font_util.cc',
-        'gfx/font_win.cc',
         'gtk_dnd_util.cc',
         'gtk_dnd_util.h',
         'gtk_signal.h',

app/gfx/font_util.cc

@@ -4,11 +4,11 @@
 
 #include "app/gfx/font_util.h"
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/font.h"
 
 namespace gfx {
 

app/l10n_util.cc

@@ -8,7 +8,6 @@
 
 #include "app/app_paths.h"
 #include "app/app_switches.h"
-#include "app/gfx/canvas.h"
 #include "app/l10n_util_collator.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ -22,6 +21,7 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "build/build_config.h"
+#include "gfx/canvas.h"
 #include "unicode/rbbi.h"
 
 #if defined(OS_MACOSX)

app/resource_bundle.cc

@@ -4,10 +4,10 @@
 
 #include "app/resource_bundle.h"
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/string_piece.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;

app/resource_bundle_dummy.cc

@@ -6,9 +6,9 @@
 
 #include <windows.h>
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/font.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 

app/resource_bundle_linux.cc

@@ -7,7 +7,6 @@
 #include <gtk/gtk.h>
 
 #include "app/app_paths.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/data_pack.h"
@@ -18,6 +17,7 @@
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
+#include "gfx/font.h"
 #include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 

app/resource_bundle_posix.cc

@@ -4,12 +4,12 @@
 
 #include "app/resource_bundle.h"
 
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/data_pack.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_piece.h"
+#include "gfx/font.h"
 
 namespace {
 

app/resource_bundle_win.cc

@@ -7,7 +7,6 @@
 #include <atlbase.h>
 
 #include "app/app_paths.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/debug_util.h"
 #include "base/file_util.h"
@@ -16,6 +15,7 @@
 #include "base/resource_util.h"
 #include "base/string_piece.h"
 #include "base/win_util.h"
+#include "gfx/font.h"
 
 namespace {
 

app/text_elider.cc

@@ -4,7 +4,6 @@
 
 #include <vector>
 
-#include "app/gfx/font.h"
 #include "app/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
@@ -12,6 +11,7 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"

app/text_elider.h

@@ -8,9 +8,9 @@
 #include <unicode/coll.h>
 #include <unicode/uchar.h>
 
-#include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "gfx/font.h"
 
 class FilePath;
 class GURL;

app/text_elider_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 "app/gfx/font.h"
 #include "app/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

app/win_util.h

@@ -10,9 +10,9 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/font.h"
 #include "base/fix_wp64.h"
 #include "base/scoped_handle.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 
 class FilePath;

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

@@ -11,7 +11,6 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ -27,6 +26,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/font.h"
 #include "gfx/gtk_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

@@ -10,7 +10,6 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/os_exchange_data.h"
@@ -43,6 +42,7 @@
 #include "chrome/common/gfx/utils.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/url_util.h"
+#include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "skia/ext/skia_utils_win.h"

chrome/browser/autocomplete/autocomplete_edit_view_win.h

@@ -12,7 +12,6 @@
 #include <atlmisc.h>
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl.
 
-#include "app/gfx/font.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/scoped_comptr_win.h"
 #include "base/scoped_ptr.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "views/controls/menu/menu_2.h"
 

chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <string>
 
-#include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
@@ -26,6 +25,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/font.h"
 #include "gfx/gtk_util.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"

chrome/browser/autocomplete/autocomplete_popup_view_mac.h

@@ -9,12 +9,12 @@
 
 #include <string>
 
-#include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
+#include "gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompletePopupModel;

chrome/browser/chromeos/compact_location_bar_view.cc

@@ -9,7 +9,6 @@
 
 #include "app/l10n_util.h"
 #include "app/drag_drop_types.h"
-#include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
@@ -26,6 +25,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/canvas.h"
 #include "gfx/point.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"

chrome/browser/chromeos/compact_navigation_bar.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/chromeos/compact_navigation_bar.h"
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/theme_background.h"
+#include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/button_dropdown.h"