Move some more files to toplevel gfx dir.

TBR=darin
BUG=none
TEST=none


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

app/app_base.gypi

@@ -45,8 +45,6 @@
           }],
           ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
             'sources!': [
-              'gfx/gtk_util.cc',
-              'gfx/gtk_util.h',
               'gtk_dnd_util.cc',
               'gtk_dnd_util.h',
               'gtk_signal.h',
@@ -111,8 +109,6 @@
         'drag_drop_types_win.cc',
         'drag_drop_types.h',
         'file_download_interface.h',
-        'gfx/blit.cc',
-        'gfx/blit.h',
         'gfx/canvas.cc',
         'gfx/canvas.h',
         'gfx/canvas_linux.cc',
@@ -134,22 +130,8 @@
         'gfx/font_win.cc',
         'gfx/gdi_util.cc',
         'gfx/gdi_util.h',
-        'gfx/gtk_util.cc',
-        'gfx/gtk_util.h',
-        'gfx/insets.h',
-        'gfx/insets.cc',
-        'gfx/native_widget_types.h',
-        'gfx/native_widget_types_gtk.cc',
         'gfx/native_theme_win.cc',
         'gfx/native_theme_win.h',
-        'gfx/gtk_native_view_id_manager.cc',
-        'gfx/gtk_native_view_id_manager.h',
-        'gfx/path.cc',
-        'gfx/path_gtk.cc',
-        'gfx/path_win.cc',
-        'gfx/path.h',
-        'gfx/scrollbar_size.cc',
-        'gfx/scrollbar_size.h',
         'gfx/skbitmap_operations.cc',
         'gfx/skbitmap_operations.h',
         'gfx/skia_util.cc',

app/menus/menu_model.h

@@ -5,9 +5,9 @@
 #ifndef APP_MENUS_MENU_MODEL_H_
 #define APP_MENUS_MENU_MODEL_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
+#include "gfx/native_widget_types.h"
 
 class SkBitmap;
 

app/resource_bundle_linux.cc

@@ -8,7 +8,6 @@
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
-#include "app/gfx/gtk_util.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/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {

app/win/window_impl.h

@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include "app/gfx/native_widget_types.h"
 #include "base/logging.h"
+#include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 
 namespace app {

chrome/browser/aeropeek_manager.cc

@@ -8,7 +8,6 @@
 #include <shobjidl.h>
 
 #include "app/gfx/gdi_util.h"
-#include "app/gfx/insets.h"
 #include "app/win_util.h"
 #include "app/win/window_impl.h"
 #include "base/command_line.h"

chrome/browser/aeropeek_manager.h

@@ -7,9 +7,9 @@
 
 #include <list>
 
-#include "app/gfx/insets.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "gfx/insets.h"
 
 namespace gfx {
 class Size;

chrome/browser/autocomplete/autocomplete_edit_view.h

@@ -13,8 +13,8 @@
 
 #include <string>
 
-#include "app/gfx/native_widget_types.h"
 #include "chrome/common/page_transition_types.h"
+#include "gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

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

chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

@@ -10,7 +10,6 @@
 #include <string>
 
 #include "app/gfx/font.h"
-#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
@@ -27,6 +26,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/gtk_util.h"
 #include "gfx/rect.h"
 #include "grit/theme_resources.h"
 

chrome/browser/autofill/autofill_dialog_gtk.cc

@@ -8,7 +8,6 @@
 
 #include <vector>
 
-#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -20,6 +19,7 @@
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/profile.h"
+#include "gfx/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"

chrome/browser/automation/automation_window_tracker.h

@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "build/build_config.h"
 #include "chrome/browser/automation/automation_resource_tracker.h"
 #include "chrome/common/native_window_notification_source.h"
+#include "gfx/native_widget_types.h"
 
 class AutomationWindowTracker
     : public AutomationResourceTracker<gfx::NativeWindow> {

chrome/browser/automation/ui_controls.h

@@ -13,7 +13,7 @@
 #include <wtypes.h>
 #endif
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 #include "base/keyboard_codes.h"
 

chrome/browser/bookmarks/bookmark_context_menu_controller.h

@@ -7,10 +7,10 @@
 
 #include <vector>
 
-#include "app/gfx/native_widget_types.h"
 #include "app/menus/simple_menu_model.h"
 #include "base/basictypes.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "gfx/native_widget_types.h"
 
 class Browser;
 class PageNavigator;

chrome/browser/bookmarks/bookmark_drop_info.h

@@ -5,10 +5,10 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DROP_INFO_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/timer.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
+#include "gfx/native_widget_types.h"
 
 namespace views {
 class DropTargetEvent;

chrome/browser/bookmarks/bookmark_editor.h

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "app/gfx/native_widget_types.h"
+#include "gfx/native_widget_types.h"
 
 class BookmarkNode;
 class GURL;

chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h

@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
+#include "gfx/native_widget_types.h"
 
 // This set of functions lets C++ code interact with the cocoa pasteboard
 // and dragging methods.

chrome/browser/bookmarks/bookmark_utils.h

@@ -8,10 +8,10 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/native_widget_types.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/history/snippet.h"
+#include "gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class BookmarkModel;

chrome/browser/browser_theme_provider_gtk.cc

@@ -6,9 +6,9 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
+#include "gfx/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 GdkPixbuf* BrowserThemeProvider::GetPixbufNamed(int id) const {

chrome/browser/browser_uitest.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/native_widget_types.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
@@ -18,10 +17,11 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "net/base/net_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "gfx/native_widget_types.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "net/base/net_util.h"
+#include "net/url_request/url_request_unittest.h"
 
 namespace {
 

chrome/browser/browser_window.h

@@ -5,9 +5,9 @@
 #ifndef CHROME_BROWSER_BROWSER_WINDOW_H_
 #define CHROME_BROWSER_BROWSER_WINDOW_H_
 
-#include "app/gfx/native_widget_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/content_settings_types.h"
+#include "gfx/native_widget_types.h"
 
 class Browser;
 class BrowserWindowTesting;