summaryrefslogtreecommitdiffstats
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/DEPS6
-rw-r--r--gfx/blit.h12
-rw-r--r--gfx/brush.h12
-rw-r--r--gfx/canvas.h12
-rw-r--r--gfx/canvas_direct2d.h12
-rw-r--r--gfx/canvas_skia.h12
-rw-r--r--gfx/canvas_skia_paint.h12
-rw-r--r--gfx/codec/jpeg_codec.h68
-rw-r--r--gfx/codec/png_codec.h105
-rw-r--r--gfx/color_utils.h12
-rw-r--r--gfx/favicon_size.h12
-rw-r--r--gfx/font.h12
-rw-r--r--gfx/gdi_util.h12
-rw-r--r--gfx/gfx_module.h12
-rw-r--r--gfx/gfx_paths.h12
-rw-r--r--gfx/gtk_native_view_id_manager.h12
-rw-r--r--gfx/gtk_preserve_window.h12
-rw-r--r--gfx/gtk_util.h12
-rw-r--r--gfx/icon_util.h12
-rw-r--r--gfx/insets.h12
-rw-r--r--gfx/native_theme_linux.h11
-rw-r--r--gfx/native_theme_win.h18
-rw-r--r--gfx/native_widget_types.h12
-rw-r--r--gfx/path.h12
-rw-r--r--gfx/platform_font.h13
-rw-r--r--gfx/platform_font_gtk.h12
-rw-r--r--gfx/platform_font_mac.h12
-rw-r--r--gfx/platform_font_win.h12
-rw-r--r--gfx/point.h12
-rw-r--r--gfx/rect.h19
-rw-r--r--gfx/resources/bitmap_brush_image.pngbin242 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-disabled-indeterminate.pngbin3914 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-disabled-off.pngbin2850 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-disabled-on.pngbin3015 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-indeterminate.pngbin3098 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-off.pngbin3024 -> 0 bytes
-rw-r--r--gfx/resources/linux-checkbox-on.pngbin3165 -> 0 bytes
-rw-r--r--gfx/resources/linux-progress-bar.pngbin182 -> 0 bytes
-rw-r--r--gfx/resources/linux-progress-border-left.pngbin148 -> 0 bytes
-rw-r--r--gfx/resources/linux-progress-border-right.pngbin146 -> 0 bytes
-rw-r--r--gfx/resources/linux-progress-value.pngbin167 -> 0 bytes
-rw-r--r--gfx/resources/linux-radio-disabled-off.pngbin2910 -> 0 bytes
-rw-r--r--gfx/resources/linux-radio-disabled-on.pngbin3015 -> 0 bytes
-rw-r--r--gfx/resources/linux-radio-off.pngbin3133 -> 0 bytes
-rw-r--r--gfx/resources/linux-radio-on.pngbin3148 -> 0 bytes
-rw-r--r--gfx/scoped_cg_context_state_mac.h11
-rw-r--r--gfx/scoped_image.h12
-rw-r--r--gfx/scrollbar_size.h12
-rw-r--r--gfx/size.h12
-rw-r--r--gfx/skbitmap_operations.h12
-rw-r--r--gfx/skia_util.h12
-rw-r--r--gfx/skia_utils_gtk.h12
-rw-r--r--gfx/test/data/icon_util/128_X_128_icon.icobin67646 -> 0 bytes
-rw-r--r--gfx/test/data/icon_util/16_X_16_icon.icobin1150 -> 0 bytes
-rw-r--r--gfx/test_suite.h12
-rw-r--r--gfx/win_util.h13
56 files changed, 0 insertions, 624 deletions
diff --git a/gfx/DEPS b/gfx/DEPS
deleted file mode 100644
index b95e33c..0000000
--- a/gfx/DEPS
+++ /dev/null
@@ -1,6 +0,0 @@
-include_rules = [
- "+base",
- "+grit/gfx_resources.h",
- "+skia",
- "+ui/gfx",
-]
diff --git a/gfx/blit.h b/gfx/blit.h
deleted file mode 100644
index 3a3a746..0000000
--- a/gfx/blit.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_BLIT_H_
-#define GFX_BLIT_H_
-#pragma once
-
-#include "ui/gfx/blit.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_BLIT_H_
diff --git a/gfx/brush.h b/gfx/brush.h
deleted file mode 100644
index de48204..0000000
--- a/gfx/brush.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_BRUSH_H_
-#define GFX_BRUSH_H_
-#pragma once
-
-#include "ui/gfx/brush.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_BRUSH_H_
diff --git a/gfx/canvas.h b/gfx/canvas.h
deleted file mode 100644
index 62cc77e..0000000
--- a/gfx/canvas.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_CANVAS_H_
-#define GFX_CANVAS_H_
-#pragma once
-
-#include "ui/gfx/canvas.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_CANVAS_H_
diff --git a/gfx/canvas_direct2d.h b/gfx/canvas_direct2d.h
deleted file mode 100644
index 4a46a396..0000000
--- a/gfx/canvas_direct2d.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_CANVAS_DIRECT2D_H_
-#define GFX_CANVAS_DIRECT2D_H_
-#pragma once
-
-#include "ui/gfx/canvas_direct2d.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_CANVAS_DIRECT2D_H_
diff --git a/gfx/canvas_skia.h b/gfx/canvas_skia.h
deleted file mode 100644
index d967eab..0000000
--- a/gfx/canvas_skia.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_CANVAS_SKIA_H_
-#define GFX_CANVAS_SKIA_H_
-#pragma once
-
-#include "ui/gfx/canvas_skia.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_CANVAS_SKIA_H_
diff --git a/gfx/canvas_skia_paint.h b/gfx/canvas_skia_paint.h
deleted file mode 100644
index 5d57184..0000000
--- a/gfx/canvas_skia_paint.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_CANVAS_SKIA_PAINT_H_
-#define GFX_CANVAS_SKIA_PAINT_H_
-#pragma once
-
-#include "ui/gfx/canvas_skia_paint.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_CANVAS_SKIA_PAINT_H_
diff --git a/gfx/codec/jpeg_codec.h b/gfx/codec/jpeg_codec.h
deleted file mode 100644
index 5c47b1a..0000000
--- a/gfx/codec/jpeg_codec.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// 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.
-
-#ifndef GFX_CODEC_JPEG_CODEC_H_
-#define GFX_CODEC_JPEG_CODEC_H_
-#pragma once
-
-#include <vector>
-
-class SkBitmap;
-
-namespace gfx {
-
-// Interface for encoding/decoding JPEG data. This is a wrapper around libjpeg,
-// which has an inconvenient interface for callers. This is only used for UI
-// elements, WebKit has its own more complicated JPEG decoder which handles,
-// among other things, partially downloaded data.
-class JPEGCodec {
- public:
- enum ColorFormat {
- // 3 bytes per pixel (packed), in RGB order regardless of endianness.
- // This is the native JPEG format.
- FORMAT_RGB,
-
- // 4 bytes per pixel, in RGBA order in mem regardless of endianness.
- FORMAT_RGBA,
-
- // 4 bytes per pixel, in BGRA order in mem regardless of endianness.
- // This is the default Windows DIB order.
- FORMAT_BGRA,
-
- // 4 bytes per pixel, it can be either RGBA or BGRA. It depends on the bit
- // order in kARGB_8888_Config skia bitmap.
- FORMAT_SkBitmap
- };
-
- // Encodes the given raw 'input' data, with each pixel being represented as
- // given in 'format'. The encoded JPEG data will be written into the supplied
- // vector and true will be returned on success. On failure (false), the
- // contents of the output buffer are undefined.
- //
- // w, h: dimensions of the image
- // row_byte_width: the width in bytes of each row. This may be greater than
- // w * bytes_per_pixel if there is extra padding at the end of each row
- // (often, each row is padded to the next machine word).
- // quality: an integer in the range 0-100, where 100 is the highest quality.
- static bool Encode(const unsigned char* input, ColorFormat format,
- int w, int h, int row_byte_width,
- int quality, std::vector<unsigned char>* output);
-
- // Decodes the JPEG data contained in input of length input_size. The
- // decoded data will be placed in *output with the dimensions in *w and *h
- // on success (returns true). This data will be written in the'format'
- // format. On failure, the values of these output variables is undefined.
- static bool Decode(const unsigned char* input, size_t input_size,
- ColorFormat format, std::vector<unsigned char>* output,
- int* w, int* h);
-
- // Decodes the JPEG data contained in input of length input_size. If
- // successful, a SkBitmap is created and returned. It is up to the caller
- // to delete the returned bitmap.
- static SkBitmap* Decode(const unsigned char* input, size_t input_size);
-};
-
-} // namespace gfx
-
-#endif // GFX_CODEC_JPEG_CODEC_H_
diff --git a/gfx/codec/png_codec.h b/gfx/codec/png_codec.h
deleted file mode 100644
index f220792..0000000
--- a/gfx/codec/png_codec.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// 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 GFX_CODEC_PNG_CODEC_H_
-#define GFX_CODEC_PNG_CODEC_H_
-#pragma once
-
-#include <vector>
-
-#include "base/basictypes.h"
-
-class SkBitmap;
-
-namespace gfx {
-
-// Interface for encoding and decoding PNG data. This is a wrapper around
-// libpng, which has an inconvenient interface for callers. This is currently
-// designed for use in tests only (where we control the files), so the handling
-// isn't as robust as would be required for a browser (see Decode() for more).
-// WebKit has its own more complicated PNG decoder which handles, among other
-// things, partially downloaded data.
-class PNGCodec {
- public:
- enum ColorFormat {
- // 3 bytes per pixel (packed), in RGB order regardless of endianness.
- // This is the native JPEG format.
- FORMAT_RGB,
-
- // 4 bytes per pixel, in RGBA order in memory regardless of endianness.
- FORMAT_RGBA,
-
- // 4 bytes per pixel, in BGRA order in memory regardless of endianness.
- // This is the default Windows DIB order.
- FORMAT_BGRA,
-
- // 4 bytes per pixel, in pre-multiplied kARGB_8888_Config format. For use
- // with directly writing to a skia bitmap.
- FORMAT_SkBitmap
- };
-
- // Encodes the given raw 'input' data, with each pixel being represented as
- // given in 'format'. The encoded PNG data will be written into the supplied
- // vector and true will be returned on success. On failure (false), the
- // contents of the output buffer are undefined.
- //
- // When writing alpha values, the input colors are assumed to be post
- // multiplied.
- //
- // w, h: dimensions of the image
- // row_byte_width: the width in bytes of each row. This may be greater than
- // w * bytes_per_pixel if there is extra padding at the end of each row
- // (often, each row is padded to the next machine word).
- // discard_transparency: when true, and when the input data format includes
- // alpha values, these alpha values will be discarded and only RGB will be
- // written to the resulting file. Otherwise, alpha values in the input
- // will be preserved.
- static bool Encode(const unsigned char* input, ColorFormat format,
- int w, int h, int row_byte_width,
- bool discard_transparency,
- std::vector<unsigned char>* output);
-
- // Call PNGCodec::Encode on the supplied SkBitmap |input|, which is assumed
- // to be BGRA, 32 bits per pixel. The params |discard_transparency| and
- // |output| are passed directly to Encode; refer to Encode for more
- // information. During the call, an SkAutoLockPixels lock is held on |input|.
- static bool EncodeBGRASkBitmap(const SkBitmap& input,
- bool discard_transparency,
- std::vector<unsigned char>* output);
-
- // Decodes the PNG data contained in input of length input_size. The
- // decoded data will be placed in *output with the dimensions in *w and *h
- // on success (returns true). This data will be written in the 'format'
- // format. On failure, the values of these output variables are undefined.
- //
- // This function may not support all PNG types, and it hasn't been tested
- // with a large number of images, so assume a new format may not work. It's
- // really designed to be able to read in something written by Encode() above.
- static bool Decode(const unsigned char* input, size_t input_size,
- ColorFormat format, std::vector<unsigned char>* output,
- int* w, int* h);
-
- // Decodes the PNG data directly into the passed in SkBitmap. This is
- // significantly faster than the vector<unsigned char> version of Decode()
- // above when dealing with PNG files that are >500K, which a lot of theme
- // images are. (There are a lot of themes that have a NTP image of about ~1
- // megabyte, and those require a 7-10 megabyte side buffer.)
- //
- // Returns true if data is non-null and can be decoded as a png, false
- // otherwise.
- static bool Decode(const unsigned char* input, size_t input_size,
- SkBitmap* bitmap);
-
- // Create a SkBitmap from a decoded BGRA DIB. The caller owns the returned
- // SkBitmap.
- static SkBitmap* CreateSkBitmapFromBGRAFormat(
- std::vector<unsigned char>& bgra, int width, int height);
-
- private:
- DISALLOW_COPY_AND_ASSIGN(PNGCodec);
-};
-
-} // namespace gfx
-
-#endif // GFX_CODEC_PNG_CODEC_H_
diff --git a/gfx/color_utils.h b/gfx/color_utils.h
deleted file mode 100644
index 166a793..0000000
--- a/gfx/color_utils.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 APP_GFX_COLOR_UTILS_H_
-#define APP_GFX_COLOR_UTILS_H_
-#pragma once
-
-#include "ui/gfx/color_utils.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // APP_GFX_COLOR_UTILS_H_
diff --git a/gfx/favicon_size.h b/gfx/favicon_size.h
deleted file mode 100644
index 9d36608..0000000
--- a/gfx/favicon_size.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 APP_GFX_FAVICON_SIZE_H_
-#define APP_GFX_FAVICON_SIZE_H_
-#pragma once
-
-#include "ui/gfx/favicon_size.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // APP_GFX_FAVICON_SIZE_H_
diff --git a/gfx/font.h b/gfx/font.h
deleted file mode 100644
index 4386326..0000000
--- a/gfx/font.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_FONT_H_
-#define GFX_FONT_H_
-#pragma once
-
-#include "ui/gfx/font.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_FONT_H_
diff --git a/gfx/gdi_util.h b/gfx/gdi_util.h
deleted file mode 100644
index 324dafc..0000000
--- a/gfx/gdi_util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef APP_GFX_GDI_UTIL_H_
-#define APP_GFX_GDI_UTIL_H_
-#pragma once
-
-#include "ui/gfx/gdi_util.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // APP_GFX_GDI_UTIL_H_
diff --git a/gfx/gfx_module.h b/gfx/gfx_module.h
deleted file mode 100644
index aa9510c..0000000
--- a/gfx/gfx_module.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 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 GFX_MODULE_H_
-#define GFX_MODULE_H_
-#pragma once
-
-#include "ui/gfx/gfx_module.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_MODULE_H_
diff --git a/gfx/gfx_paths.h b/gfx/gfx_paths.h
deleted file mode 100644
index 8ee96bf..0000000
--- a/gfx/gfx_paths.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_GFX_PATHS_H_
-#define GFX_GFX_PATHS_H_
-#pragma once
-
-#include "ui/gfx/gfx_paths.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_GFX_PATHS_H_
diff --git a/gfx/gtk_native_view_id_manager.h b/gfx/gtk_native_view_id_manager.h
deleted file mode 100644
index 8fd601b..0000000
--- a/gfx/gtk_native_view_id_manager.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
-#define GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
-#pragma once
-
-#include "ui/gfx/gtk_native_view_id_manager.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
diff --git a/gfx/gtk_preserve_window.h b/gfx/gtk_preserve_window.h
deleted file mode 100644
index bf62d00..0000000
--- a/gfx/gtk_preserve_window.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_GTK_PRESERVE_WINDOW_H_
-#define GFX_GTK_PRESERVE_WINDOW_H_
-#pragma once
-
-#include "ui/gfx/gtk_preserve_window.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_GTK_PRESERVE_WINDOW_H_
diff --git a/gfx/gtk_util.h b/gfx/gtk_util.h
deleted file mode 100644
index d8d0b49..0000000
--- a/gfx/gtk_util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_GTK_UTIL_H_
-#define GFX_GTK_UTIL_H_
-#pragma once
-
-#include "ui/gfx/gtk_util.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_GTK_UTIL_H_
diff --git a/gfx/icon_util.h b/gfx/icon_util.h
deleted file mode 100644
index 6b96190..0000000
--- a/gfx/icon_util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_ICON_UTIL_H_
-#define GFX_ICON_UTIL_H_
-#pragma once
-
-#include "ui/gfx/icon_util.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_ICON_UTIL_H_
diff --git a/gfx/insets.h b/gfx/insets.h
deleted file mode 100644
index aa1191b..0000000
--- a/gfx/insets.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_INSETS_H_
-#define GFX_INSETS_H_
-#pragma once
-
-#include "ui/gfx/insets.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_INSETS_H_
diff --git a/gfx/native_theme_linux.h b/gfx/native_theme_linux.h
deleted file mode 100644
index 679c6b8..0000000
--- a/gfx/native_theme_linux.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2011 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 GFX_NATIVE_THEME_LINUX_H_
-#define GFX_NATIVE_THEME_LINUX_H_
-
-#include "ui/gfx/native_theme_linux.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_NATIVE_THEME_LINUX_H_
diff --git a/gfx/native_theme_win.h b/gfx/native_theme_win.h
deleted file mode 100644
index c45b5fc..0000000
--- a/gfx/native_theme_win.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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.
-//
-// A wrapper class for working with custom XP/Vista themes provided in
-// uxtheme.dll. This is a singleton class that can be grabbed using
-// NativeTheme::instance().
-// For more information on visual style parts and states, see:
-// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp
-
-#ifndef APP_GFX_NATIVE_THEME_WIN_H_
-#define APP_GFX_NATIVE_THEME_WIN_H_
-#pragma once
-
-#include "ui/gfx/native_theme_win.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // APP_GFX_NATIVE_THEME_WIN_H_
diff --git a/gfx/native_widget_types.h b/gfx/native_widget_types.h
deleted file mode 100644
index f8ff236..0000000
--- a/gfx/native_widget_types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_NATIVE_WIDGET_TYPES_H_
-#define GFX_NATIVE_WIDGET_TYPES_H_
-#pragma once
-
-#include "ui/gfx/native_widget_types.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_NATIVE_WIDGET_TYPES_H_
diff --git a/gfx/path.h b/gfx/path.h
deleted file mode 100644
index 9c9b0be..0000000
--- a/gfx/path.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_PATH_H_
-#define GFX_PATH_H_
-#pragma once
-
-#include "ui/gfx/path.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_PATH_H_
diff --git a/gfx/platform_font.h b/gfx/platform_font.h
deleted file mode 100644
index 2a88fff..0000000
--- a/gfx/platform_font.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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 GFX_PLATFORM_FONT_
-#define GFX_PLATFORM_FONT_
-#pragma once
-
-#include "ui/gfx/platform_font.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_PLATFORM_FONT_
-
diff --git a/gfx/platform_font_gtk.h b/gfx/platform_font_gtk.h
deleted file mode 100644
index b87df6c..0000000
--- a/gfx/platform_font_gtk.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 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 GFX_PLATFORM_FONT_GTK_
-#define GFX_PLATFORM_FONT_GTK_
-#pragma once
-
-#include "ui/gfx/platform_font_gtk.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_PLATFORM_FONT_GTK_
diff --git a/gfx/platform_font_mac.h b/gfx/platform_font_mac.h
deleted file mode 100644
index 8f676d7..0000000
--- a/gfx/platform_font_mac.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_PLATFORM_FONT_MAC_
-#define GFX_PLATFORM_FONT_MAC_
-#pragma once
-
-#include "ui/gfx/platform_font_mac.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_PLATFORM_FONT_MAC_
diff --git a/gfx/platform_font_win.h b/gfx/platform_font_win.h
deleted file mode 100644
index b491e80..0000000
--- a/gfx/platform_font_win.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_PLATFORM_FONT_WIN_
-#define GFX_PLATFORM_FONT_WIN_
-#pragma once
-
-#include "ui/gfx/platform_font_win.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_PLATFORM_FONT_WIN_
diff --git a/gfx/point.h b/gfx/point.h
deleted file mode 100644
index ff313c7..0000000
--- a/gfx/point.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_POINT_H_
-#define GFX_POINT_H_
-#pragma once
-
-#include "ui/gfx/point.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_POINT_H_
diff --git a/gfx/rect.h b/gfx/rect.h
deleted file mode 100644
index d064666..0000000
--- a/gfx/rect.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.
-
-// 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 Contains()) to complain in this case.
-
-#ifndef GFX_RECT_H_
-#define GFX_RECT_H_
-#pragma once
-
-#include "ui/gfx/rect.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_RECT_H_
diff --git a/gfx/resources/bitmap_brush_image.png b/gfx/resources/bitmap_brush_image.png
deleted file mode 100644
index be8d7e7..0000000
--- a/gfx/resources/bitmap_brush_image.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-disabled-indeterminate.png b/gfx/resources/linux-checkbox-disabled-indeterminate.png
deleted file mode 100644
index 171d001..0000000
--- a/gfx/resources/linux-checkbox-disabled-indeterminate.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-disabled-off.png b/gfx/resources/linux-checkbox-disabled-off.png
deleted file mode 100644
index c916674..0000000
--- a/gfx/resources/linux-checkbox-disabled-off.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-disabled-on.png b/gfx/resources/linux-checkbox-disabled-on.png
deleted file mode 100644
index d9ff1c6..0000000
--- a/gfx/resources/linux-checkbox-disabled-on.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-indeterminate.png b/gfx/resources/linux-checkbox-indeterminate.png
deleted file mode 100644
index dcde3c1..0000000
--- a/gfx/resources/linux-checkbox-indeterminate.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-off.png b/gfx/resources/linux-checkbox-off.png
deleted file mode 100644
index 15cc949..0000000
--- a/gfx/resources/linux-checkbox-off.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-checkbox-on.png b/gfx/resources/linux-checkbox-on.png
deleted file mode 100644
index 4c72e8a..0000000
--- a/gfx/resources/linux-checkbox-on.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-progress-bar.png b/gfx/resources/linux-progress-bar.png
deleted file mode 100644
index 82a20f5..0000000
--- a/gfx/resources/linux-progress-bar.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-progress-border-left.png b/gfx/resources/linux-progress-border-left.png
deleted file mode 100644
index 0dd0e50..0000000
--- a/gfx/resources/linux-progress-border-left.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-progress-border-right.png b/gfx/resources/linux-progress-border-right.png
deleted file mode 100644
index d351b11..0000000
--- a/gfx/resources/linux-progress-border-right.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-progress-value.png b/gfx/resources/linux-progress-value.png
deleted file mode 100644
index 251917b..0000000
--- a/gfx/resources/linux-progress-value.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-radio-disabled-off.png b/gfx/resources/linux-radio-disabled-off.png
deleted file mode 100644
index 97aa6f9..0000000
--- a/gfx/resources/linux-radio-disabled-off.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-radio-disabled-on.png b/gfx/resources/linux-radio-disabled-on.png
deleted file mode 100644
index 07aed36..0000000
--- a/gfx/resources/linux-radio-disabled-on.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-radio-off.png b/gfx/resources/linux-radio-off.png
deleted file mode 100644
index 6a60a70..0000000
--- a/gfx/resources/linux-radio-off.png
+++ /dev/null
Binary files differ
diff --git a/gfx/resources/linux-radio-on.png b/gfx/resources/linux-radio-on.png
deleted file mode 100644
index cb47411..0000000
--- a/gfx/resources/linux-radio-on.png
+++ /dev/null
Binary files differ
diff --git a/gfx/scoped_cg_context_state_mac.h b/gfx/scoped_cg_context_state_mac.h
deleted file mode 100644
index f661efe..0000000
--- a/gfx/scoped_cg_context_state_mac.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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 GFX_SCOPED_CG_CONTEXT_STATE_MAC_H_
-#define GFX_SCOPED_CG_CONTEXT_STATE_MAC_H_
-
-#include "ui/gfx/scoped_cg_context_state_mac.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SCOPED_CG_CONTEXT_STATE_MAC_H_
diff --git a/gfx/scoped_image.h b/gfx/scoped_image.h
deleted file mode 100644
index 686f249..0000000
--- a/gfx/scoped_image.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_SCOPED_IMAGE_H_
-#define GFX_SCOPED_IMAGE_H_
-#pragma once
-
-#include "ui/gfx/scoped_image.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SCOPED_IMAGE_H_
diff --git a/gfx/scrollbar_size.h b/gfx/scrollbar_size.h
deleted file mode 100644
index 2bf70b9..0000000
--- a/gfx/scrollbar_size.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_SCROLLBAR_SIZE_H_
-#define GFX_SCROLLBAR_SIZE_H_
-#pragma once
-
-#include "ui/gfx/scrollbar_size.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SCROLLBAR_SIZE_H_
diff --git a/gfx/size.h b/gfx/size.h
deleted file mode 100644
index ad132ad..0000000
--- a/gfx/size.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_SIZE_H_
-#define GFX_SIZE_H_
-#pragma once
-
-#include "ui/gfx/size.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SIZE_H_
diff --git a/gfx/skbitmap_operations.h b/gfx/skbitmap_operations.h
deleted file mode 100644
index 42aa7b3..0000000
--- a/gfx/skbitmap_operations.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef GFX_SKBITMAP_OPERATIONS_H_
-#define GFX_SKBITMAP_OPERATIONS_H_
-#pragma once
-
-#include "ui/gfx/skbitmap_operations.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SKBITMAP_OPERATIONS_H_
diff --git a/gfx/skia_util.h b/gfx/skia_util.h
deleted file mode 100644
index 1af4255..0000000
--- a/gfx/skia_util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 GFX_SKIA_UTIL_H_
-#define GFX_SKIA_UTIL_H_
-#pragma once
-
-#include "ui/gfx/skia_util.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_SKIA_UTIL_H_
diff --git a/gfx/skia_utils_gtk.h b/gfx/skia_utils_gtk.h
deleted file mode 100644
index f958340..0000000
--- a/gfx/skia_utils_gtk.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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 APP_GFX_SKIA_UTILS_GTK_H_
-#define APP_GFX_SKIA_UTILS_GTK_H_
-#pragma once
-
-#include "ui/gfx/skia_utils_gtk.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // APP_GFX_SKIA_UTILS_GTK_H_
diff --git a/gfx/test/data/icon_util/128_X_128_icon.ico b/gfx/test/data/icon_util/128_X_128_icon.ico
deleted file mode 100644
index a5d72fe..0000000
--- a/gfx/test/data/icon_util/128_X_128_icon.ico
+++ /dev/null
Binary files differ
diff --git a/gfx/test/data/icon_util/16_X_16_icon.ico b/gfx/test/data/icon_util/16_X_16_icon.ico
deleted file mode 100644
index 0e524f1..0000000
--- a/gfx/test/data/icon_util/16_X_16_icon.ico
+++ /dev/null
Binary files differ
diff --git a/gfx/test_suite.h b/gfx/test_suite.h
deleted file mode 100644
index 97c6a8f..0000000
--- a/gfx/test_suite.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2011 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 GFX_TEST_SUITE_H_
-#define GFX_TEST_SUITE_H_
-#pragma once
-
-#include "ui/gfx/test_suite.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_TEST_SUITE_H_
diff --git a/gfx/win_util.h b/gfx/win_util.h
deleted file mode 100644
index fc5cc0f..0000000
--- a/gfx/win_util.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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 GFX_WIN_UTIL_H_
-#define GFX_WIN_UTIL_H_
-#pragma once
-
-#include "ui/gfx/win_util.h"
-// TODO(sail): remove this file once all includes have been updated.
-
-#endif // GFX_WIN_UTIL_H_
-