Adds a gfx_export.h to ui/gfx and converts all code in ui/gfx to

include it rather than ui_export.h

TBR=sky@chromium.org
http://crbug.com/285385

Review URL: https://codereview.chromium.org/23486010

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

70 files changed, 82 insertions, 69 deletions

diff --git a/ui/gfx/android/device_display_info.h b/ui/gfx/android/device_display_info.h
index af7bb62..9f90f89 100644
--- a/ui/gfx/android/device_display_info.h
+++ b/ui/gfx/android/device_display_info.h
@@ -10,7 +10,7 @@
 
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/blit.h b/ui/gfx/blit.h
index 616fda3..f066817 100644
--- a/ui/gfx/blit.h
+++ b/ui/gfx/blit.h
@@ -5,8 +5,8 @@
 #ifndef UI_GFX_BLIT_H_
 #define UI_GFX_BLIT_H_
 
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/base/ui_export.h"
 
 class SkCanvas;
 
diff --git a/ui/gfx/canvas_paint.h b/ui/gfx/canvas_paint.h
index 1db5341..4ae8b7c 100644
--- a/ui/gfx/canvas_paint.h
+++ b/ui/gfx/canvas_paint.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_CANVAS_PAINT_H_
 #define UI_GFX_CANVAS_PAINT_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
diff --git a/ui/gfx/codec/jpeg_codec.h b/ui/gfx/codec/jpeg_codec.h
index e4edeee..b6b7088 100644
--- a/ui/gfx/codec/jpeg_codec.h
+++ b/ui/gfx/codec/jpeg_codec.h
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <vector>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 
diff --git a/ui/gfx/codec/png_codec.h b/ui/gfx/codec/png_codec.h
index 0088bb3..86f170d 100644
--- a/ui/gfx/codec/png_codec.h
+++ b/ui/gfx/codec/png_codec.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 
diff --git a/ui/gfx/color_analysis.h b/ui/gfx/color_analysis.h
index 1d0b1a5..797b4f9 100644
--- a/ui/gfx/color_analysis.h
+++ b/ui/gfx/color_analysis.h
@@ -10,7 +10,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/matrix3_f.h"
 
 class SkBitmap;
diff --git a/ui/gfx/color_profile.h b/ui/gfx/color_profile.h
index 5e50f6b..3a3f5b2 100644
--- a/ui/gfx/color_profile.h
+++ b/ui/gfx/color_profile.h
@@ -9,7 +9,7 @@
 
 #include "base/basictypes.h"
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/color_utils.h b/ui/gfx/color_utils.h
index c9f6206..440e382 100644
--- a/ui/gfx/color_utils.h
+++ b/ui/gfx/color_utils.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 
diff --git a/ui/gfx/display.h b/ui/gfx/display.h
index 2282cb0..c02c6b3 100644
--- a/ui/gfx/display.h
+++ b/ui/gfx/display.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
diff --git a/ui/gfx/display_observer.h b/ui/gfx/display_observer.h
index 85a4086..1e7cd8c 100644
--- a/ui/gfx/display_observer.h
+++ b/ui/gfx/display_observer.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_DISPLAY_OBSERVER_H_
 #define UI_GFX_DISPLAY_OBSERVER_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 class Display;
diff --git a/ui/gfx/favicon_size.h b/ui/gfx/favicon_size.h
index 6b2c6a1..ecab851 100644
--- a/ui/gfx/favicon_size.h
+++ b/ui/gfx/favicon_size.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_FAVICON_SIZE_H_
 #define UI_GFX_FAVICON_SIZE_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/font.h b/ui/gfx/font.h
index bd6e465..dfbf410 100644
--- a/ui/gfx/font.h
+++ b/ui/gfx/font.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
diff --git a/ui/gfx/font_list.h b/ui/gfx/font_list.h
index 22be912..ae96251 100644
--- a/ui/gfx/font_list.h
+++ b/ui/gfx/font_list.h
@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include "ui/base/ui_export.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/font_render_params_linux.h b/ui/gfx/font_render_params_linux.h
index ec39302..9ba6ca9 100644
--- a/ui/gfx/font_render_params_linux.h
+++ b/ui/gfx/font_render_params_linux.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_FONT_RENDER_PARAMS_LINUX_H_
 #define UI_GFX_FONT_RENDER_PARAMS_LINUX_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/gdi_util.h b/ui/gfx/gdi_util.h
index fdf6a67..53b6e91 100644
--- a/ui/gfx/gdi_util.h
+++ b/ui/gfx/gdi_util.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <windows.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/path.h"
 
diff --git a/ui/gfx/gfx_export.h b/ui/gfx/gfx_export.h
new file mode 100644
index 0000000..d99a9956
--- /dev/null
+++ b/ui/gfx/gfx_export.h
@@ -0,0 +1,13 @@
+// Copyright (c) 2013 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 UI_GFX_GFX_EXPORT_H_
+#define UI_GFX_GFX_EXPORT_H_
+
+// TODO(beng): put in normal export #defines once gfx dependencies have been
+//             corrected.
+
+#include "ui/base/ui_export.h"
+
+#endif  // UI_GFX_GFX_EXPORT_H_
diff --git a/ui/gfx/gfx_paths.h b/ui/gfx/gfx_paths.h
index 24fad8b..d5eec96 100644
--- a/ui/gfx/gfx_paths.h
+++ b/ui/gfx/gfx_paths.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_GFX_PATHS_H_
 #define UI_GFX_GFX_PATHS_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 // This file declares path keys for the app module.  These can be used with
 // the PathService to access various special directories and files.
diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h
index ff94979..c600527 100644
--- a/ui/gfx/gpu_memory_buffer.h
+++ b/ui/gfx/gpu_memory_buffer.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 #if defined(OS_ANDROID)
 #include <third_party/khronos/EGL/egl.h>
diff --git a/ui/gfx/gtk_native_view_id_manager.h b/ui/gfx/gtk_native_view_id_manager.h
index 7c8afcc..242cf09 100644
--- a/ui/gfx/gtk_native_view_id_manager.h
+++ b/ui/gfx/gtk_native_view_id_manager.h
@@ -8,7 +8,7 @@
 #include <map>
 
 #include "base/synchronization/lock.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 template <typename T> struct DefaultSingletonTraits;
diff --git a/ui/gfx/gtk_preserve_window.h b/ui/gfx/gtk_preserve_window.h
index 53a821e..f48be3f 100644
--- a/ui/gfx/gtk_preserve_window.h
+++ b/ui/gfx/gtk_preserve_window.h
@@ -9,7 +9,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 // GtkFixed creates an X window when realized and destroys an X window
 // when unrealized. GtkPreserveWindow allows overrides this
diff --git a/ui/gfx/gtk_util.h b/ui/gfx/gtk_util.h
index 5fe0c08..5672bbd 100644
--- a/ui/gfx/gtk_util.h
+++ b/ui/gfx/gtk_util.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/time/time.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GdkRegion GdkRegion;
diff --git a/ui/gfx/icon_util.h b/ui/gfx/icon_util.h
index 7ce5606..d56f5a1 100644
--- a/ui/gfx/icon_util.h
+++ b/ui/gfx/icon_util.h
@@ -12,7 +12,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
 
diff --git a/ui/gfx/image/cairo_cached_surface.h b/ui/gfx/image/cairo_cached_surface.h
index d29d9be..7c0204a 100644
--- a/ui/gfx/image/cairo_cached_surface.h
+++ b/ui/gfx/image/cairo_cached_surface.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 typedef struct _GdkDisplay GdkDisplay;
 typedef struct _GdkPixbuf GdkPixbuf;
diff --git a/ui/gfx/image/canvas_image_source.h b/ui/gfx/image/canvas_image_source.h
index a713b95..8373387 100644
--- a/ui/gfx/image/canvas_image_source.h
+++ b/ui/gfx/image/canvas_image_source.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/size.h"
 
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h
index e9619dc..00b5baa 100644
--- a/ui/gfx/image/image.h
+++ b/ui/gfx/image/image.h
@@ -25,7 +25,7 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted_memory.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
diff --git a/ui/gfx/image/image_family.h b/ui/gfx/image/image_family.h
index 902dede..c794371 100644
--- a/ui/gfx/image/image_family.h
+++ b/ui/gfx/image/image_family.h
@@ -9,7 +9,7 @@
 #include <map>
 #include <utility>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image.h"
 
 namespace gfx {
diff --git a/ui/gfx/image/image_png_rep.h b/ui/gfx/image/image_png_rep.h
index 466e37c..7e5ce5b 100644
--- a/ui/gfx/image/image_png_rep.h
+++ b/ui/gfx/image/image_png_rep.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/ref_counted_memory.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 class Size;
diff --git a/ui/gfx/image/image_skia.h b/ui/gfx/image/image_skia.h
index 9d0e9afa..4bc21f8 100644
--- a/ui/gfx/image/image_skia.h
+++ b/ui/gfx/image/image_skia.h
@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
 namespace gfx {
diff --git a/ui/gfx/image/image_skia_operations.h b/ui/gfx/image/image_skia_operations.h
index 9e397df..92da50c 100644
--- a/ui/gfx/image/image_skia_operations.h
+++ b/ui/gfx/image/image_skia_operations.h
@@ -7,8 +7,8 @@
 
 #include "base/gtest_prod_util.h"
 #include "skia/ext/image_operations.h"
-#include "ui/base/ui_export.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/gfx/skbitmap_operations.h"
 
diff --git a/ui/gfx/image/image_skia_rep.h b/ui/gfx/image/image_skia_rep.h
index 1314215..6fca411 100644
--- a/ui/gfx/image/image_skia_rep.h
+++ b/ui/gfx/image/image_skia_rep.h
@@ -7,7 +7,7 @@
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
diff --git a/ui/gfx/image/image_skia_source.h b/ui/gfx/image/image_skia_source.h
index 1fff135..ed38e1c 100644
--- a/ui/gfx/image/image_skia_source.h
+++ b/ui/gfx/image/image_skia_source.h
@@ -6,7 +6,7 @@
 #define UI_GFX_IMAGE_IMAGE_SKIA_SOURCE_H_
 
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/image/image_skia_util_ios.h b/ui/gfx/image/image_skia_util_ios.h
index ff4468d..57c9698 100644
--- a/ui/gfx/image/image_skia_util_ios.h
+++ b/ui/gfx/image/image_skia_util_ios.h
@@ -6,7 +6,7 @@
 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_
 
 #include "ui/base/layout.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 #ifdef __OBJC__
 @class UIImage;
diff --git a/ui/gfx/image/image_skia_util_mac.h b/ui/gfx/image/image_skia_util_mac.h
index 1a4427d..10d05b0 100644
--- a/ui/gfx/image/image_skia_util_mac.h
+++ b/ui/gfx/image/image_skia_util_mac.h
@@ -7,7 +7,7 @@
 
 #include <ApplicationServices/ApplicationServices.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 #ifdef __LP64__
 typedef CGSize NSSize;
diff --git a/ui/gfx/image/image_util.h b/ui/gfx/image/image_util.h
index 9ada2fe..a039557 100644
--- a/ui/gfx/image/image_util.h
+++ b/ui/gfx/image/image_util.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 class Image;
diff --git a/ui/gfx/insets.h b/ui/gfx/insets.h
index f9ef4ff..571751d 100644
--- a/ui/gfx/insets.h
+++ b/ui/gfx/insets.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/insets_base.h"
 
 #if defined(TOOLKIT_GTK)
diff --git a/ui/gfx/insets_base.h b/ui/gfx/insets_base.h
index bf0b483..ab105bc 100644
--- a/ui/gfx/insets_base.h
+++ b/ui/gfx/insets_base.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_INSETS_BASE_H_
 #define UI_GFX_INSETS_BASE_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/insets_f.h b/ui/gfx/insets_f.h
index d447d94..045b8a0 100644
--- a/ui/gfx/insets_f.h
+++ b/ui/gfx/insets_f.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/insets_base.h"
 
 namespace gfx {
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index faf3607..451f56d 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -13,7 +13,7 @@
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 // This file provides cross platform typedefs for native widget types.
 //   NativeWindow: this is a handle to a native, top-level window
diff --git a/ui/gfx/pango_util.h b/ui/gfx/pango_util.h
index abb0a7d..8401638 100644
--- a/ui/gfx/pango_util.h
+++ b/ui/gfx/pango_util.h
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 typedef struct _PangoContext PangoContext;
 
diff --git a/ui/gfx/path.h b/ui/gfx/path.h
index 1e86629..f1c7718 100644
--- a/ui/gfx/path.h
+++ b/ui/gfx/path.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkPath.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
diff --git a/ui/gfx/path_win.h b/ui/gfx/path_win.h
index 6df025b..f64bc80 100644
--- a/ui/gfx/path_win.h
+++ b/ui/gfx/path_win.h
@@ -7,7 +7,7 @@
 
 #include <windows.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkPath;
 
diff --git a/ui/gfx/path_x11.h b/ui/gfx/path_x11.h
index df3ad62..e5a3092 100644
--- a/ui/gfx/path_x11.h
+++ b/ui/gfx/path_x11.h
@@ -8,7 +8,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xregion.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkPath;
 
diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
index c5f7120..09bf8be 100644
--- a/ui/gfx/platform_font.h
+++ b/ui/gfx/platform_font.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
diff --git a/ui/gfx/platform_font_win.h b/ui/gfx/platform_font_win.h
index 568bf95..ffa8249 100644
--- a/ui/gfx/platform_font_win.h
+++ b/ui/gfx/platform_font_win.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/platform_font.h"
 
 namespace gfx {
diff --git a/ui/gfx/point.h b/ui/gfx/point.h
index 0f8a327..cb233da 100644
--- a/ui/gfx/point.h
+++ b/ui/gfx/point.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_POINT_H_
 #define UI_GFX_POINT_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point_base.h"
 #include "ui/gfx/point_f.h"
 #include "ui/gfx/vector2d.h"
diff --git a/ui/gfx/point3_f.h b/ui/gfx/point3_f.h
index 8c700df..5ea0c31 100644
--- a/ui/gfx/point3_f.h
+++ b/ui/gfx/point3_f.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point_f.h"
 #include "ui/gfx/vector3d_f.h"
 
diff --git a/ui/gfx/point_base.h b/ui/gfx/point_base.h
index 048b093..17f1d51 100644
--- a/ui/gfx/point_base.h
+++ b/ui/gfx/point_base.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/point_f.h b/ui/gfx/point_f.h
index a7b841f..d9fc18c 100644
--- a/ui/gfx/point_f.h
+++ b/ui/gfx/point_f.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point_base.h"
 #include "ui/gfx/vector2d_f.h"
 
diff --git a/ui/gfx/quad_f.h b/ui/gfx/quad_f.h
index 4173dbe..b51bcbe 100644
--- a/ui/gfx/quad_f.h
+++ b/ui/gfx/quad_f.h
@@ -8,7 +8,7 @@
 #include <cmath>
 #include <string>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point_f.h"
 #include "ui/gfx/rect_f.h"
 
diff --git a/ui/gfx/safe_integer_conversions.h b/ui/gfx/safe_integer_conversions.h
index edd8a4c..523b1f3 100644
--- a/ui/gfx/safe_integer_conversions.h
+++ b/ui/gfx/safe_integer_conversions.h
@@ -8,7 +8,7 @@
 #include <cmath>
 #include <limits>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
index f4b11ad..9b0b778 100644
--- a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
+++ b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
@@ -6,7 +6,7 @@
 #define UI_GFX_SCOPED_NS_GRAPHICS_CONTEXT_SAVE_GSTATE_MAC_H_
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 #if defined(__OBJC__)
 @class NSGraphicsContext;
diff --git a/ui/gfx/screen.h b/ui/gfx/screen.h
index d94e3e0..aa7af03 100644
--- a/ui/gfx/screen.h
+++ b/ui/gfx/screen.h
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
 #include "ui/gfx/display.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen_type_delegate.h"
diff --git a/ui/gfx/screen_win.h b/ui/gfx/screen_win.h
index 8905d46..a9fb7f5 100644
--- a/ui/gfx/screen_win.h
+++ b/ui/gfx/screen_win.h
@@ -6,7 +6,7 @@
 #define UI_GFX_SCREEN_WIN_H_
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/screen.h"
 
 namespace gfx {
diff --git a/ui/gfx/scrollbar_size.h b/ui/gfx/scrollbar_size.h
index 43f1ca5..d11774d 100644
--- a/ui/gfx/scrollbar_size.h
+++ b/ui/gfx/scrollbar_size.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_SCROLLBAR_SIZE_H_
 #define UI_GFX_SCROLLBAR_SIZE_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/selection_model.h b/ui/gfx/selection_model.h
index b99b383..3789584 100644
--- a/ui/gfx/selection_model.h
+++ b/ui/gfx/selection_model.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "ui/base/range/range.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/shadow_value.h b/ui/gfx/shadow_value.h
index d07ac94..46d84b4 100644
--- a/ui/gfx/shadow_value.h
+++ b/ui/gfx/shadow_value.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
diff --git a/ui/gfx/size.h b/ui/gfx/size.h
index f6152a3..c2340eb 100644
--- a/ui/gfx/size.h
+++ b/ui/gfx/size.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/size_base.h"
 #include "ui/gfx/size_f.h"
 
diff --git a/ui/gfx/size_base.h b/ui/gfx/size_base.h
index 6f23fa3..72d47d2 100644
--- a/ui/gfx/size_base.h
+++ b/ui/gfx/size_base.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_SIZE_BASE_H_
 #define UI_GFX_SIZE_BASE_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/size_f.h b/ui/gfx/size_f.h
index a38d3f6..ee90189 100644
--- a/ui/gfx/size_f.h
+++ b/ui/gfx/size_f.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/size_base.h"
 
 namespace gfx {
diff --git a/ui/gfx/skbitmap_operations.h b/ui/gfx/skbitmap_operations.h
index eb41d0f..3a0d3c9 100644
--- a/ui/gfx/skbitmap_operations.h
+++ b/ui/gfx/skbitmap_operations.h
@@ -6,8 +6,8 @@
 #define UI_GFX_SKBITMAP_OPERATIONS_H_
 
 #include "base/gtest_prod_util.h"
-#include "ui/base/ui_export.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/shadow_value.h"
 
 namespace gfx {
diff --git a/ui/gfx/skia_util.h b/ui/gfx/skia_util.h
index 4a2cfcf..592ff5f 100644
--- a/ui/gfx/skia_util.h
+++ b/ui/gfx/skia_util.h
@@ -12,7 +12,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 class SkBitmap;
 class SkDrawLooper;
diff --git a/ui/gfx/skia_utils_gtk.h b/ui/gfx/skia_utils_gtk.h
index 6d56e0f..abe3977 100644
--- a/ui/gfx/skia_utils_gtk.h
+++ b/ui/gfx/skia_utils_gtk.h
@@ -6,7 +6,7 @@
 #define UI_GFX_SKIA_UTILS_GTK_H_
 
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 typedef struct _GdkColor GdkColor;
 
diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h
index 3bae452..cbd2e8af 100644
--- a/ui/gfx/switches.h
+++ b/ui/gfx/switches.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_SWITCHES_H_
 #define UI_GFX_SWITCHES_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 namespace switches {
diff --git a/ui/gfx/sys_color_change_listener.h b/ui/gfx/sys_color_change_listener.h
index 2d19663..db3f9df 100644
--- a/ui/gfx/sys_color_change_listener.h
+++ b/ui/gfx/sys_color_change_listener.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/text_utils.h b/ui/gfx/text_utils.h
index 15bf3ca..bd94902 100644
--- a/ui/gfx/text_utils.h
+++ b/ui/gfx/text_utils.h
@@ -6,7 +6,7 @@
 #define UI_GFX_TEXT_UTILS_H_
 
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/transform.h b/ui/gfx/transform.h
index 7a7543a..1109099 100644
--- a/ui/gfx/transform.h
+++ b/ui/gfx/transform.h
@@ -9,7 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace gfx {
diff --git a/ui/gfx/transform_util.h b/ui/gfx/transform_util.h
index b6da7b0..19a98a3 100644
--- a/ui/gfx/transform_util.h
+++ b/ui/gfx/transform_util.h
@@ -5,7 +5,7 @@
 #ifndef UI_GFX_TRANSFORM_UTIL_H_
 #define UI_GFX_TRANSFORM_UTIL_H_
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
diff --git a/ui/gfx/vector2d.h b/ui/gfx/vector2d.h
index 69f6b40..9494120 100644
--- a/ui/gfx/vector2d.h
+++ b/ui/gfx/vector2d.h
@@ -13,7 +13,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace gfx {
diff --git a/ui/gfx/vector2d_f.h b/ui/gfx/vector2d_f.h
index 4faf28a..ebd0b5b 100644
--- a/ui/gfx/vector2d_f.h
+++ b/ui/gfx/vector2d_f.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 
 namespace gfx {
 
diff --git a/ui/gfx/vector3d_f.h b/ui/gfx/vector3d_f.h
index 17ad332..aaa415b 100644
--- a/ui/gfx/vector3d_f.h
+++ b/ui/gfx/vector3d_f.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "ui/base/ui_export.h"
+#include "ui/gfx/gfx_export.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace gfx {