diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-13 00:13:44 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-13 00:13:44 +0000 |
| commit | 00ed945c41686d11c6d9061aacda46a297297804 (patch) | |
| tree | c39c65ee331e848c92bf3f42a316e6243d44339b /ui | |
| parent | 0e6f56d09ae4323ce7a8ac65f367524b05d22e11 (diff) | |
| download | chromium_src-00ed945c41686d11c6d9061aacda46a297297804.zip chromium_src-00ed945c41686d11c6d9061aacda46a297297804.tar.gz chromium_src-00ed945c41686d11c6d9061aacda46a297297804.tar.bz2 | |
Carnitas: Delete stub src/gfx/* headers
The last references to src/gfx/* have been updated so it's safe to delete the stub headers.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6474031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/DEPS | 1 | ||||
| -rw-r--r-- | ui/gfx/gfx_resources.grd | 2 | ||||
| -rw-r--r-- | ui/gfx/image.h | 2 | ||||
| -rw-r--r-- | ui/gfx/image_unittest.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/image_unittest.h | 2 |
5 files changed, 3 insertions, 6 deletions
@@ -1,5 +1,4 @@ include_rules = [ - "+gfx", "+net", "+skia", "+third_party/mozilla", diff --git a/ui/gfx/gfx_resources.grd b/ui/gfx/gfx_resources.grd index 8b9b4b4..357679d 100644 --- a/ui/gfx/gfx_resources.grd +++ b/ui/gfx/gfx_resources.grd @@ -7,8 +7,6 @@ <output filename="grit/gfx_resources_map.cc" type="resource_map_source" /> <output filename="grit/gfx_resources_map.h" type="resource_map_header" /> <output filename="gfx_resources.pak" type="data_package" /> - <!-- TODO(sail): remove this file once WebKit has been updated. --> - <output filename="../../gfx/gfx_resources.pak" type="data_package" /> <output filename="gfx_resources.rc" type="rc_all" /> </outputs> <release seq="1"> diff --git a/ui/gfx/image.h b/ui/gfx/image.h index 7abede8..ebd5cc5 100644 --- a/ui/gfx/image.h +++ b/ui/gfx/image.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "build/build_config.h" -#include "gfx/native_widget_types.h" // Forward-declares GdkPixbuf and NSImage. +#include "ui/gfx/native_widget_types.h" // Forward-declares GdkPixbuf and NSImage. #include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/ui/gfx/image_unittest.cc b/ui/gfx/image_unittest.cc index 10dea88..cb4fd49 100644 --- a/ui/gfx/image_unittest.cc +++ b/ui/gfx/image_unittest.cc @@ -11,7 +11,7 @@ #if defined(OS_LINUX) #include <gtk/gtk.h> -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" #elif defined(OS_MACOSX) #include "base/mac/mac_util.h" #include "skia/ext/skia_utils_mac.h" diff --git a/ui/gfx/image_unittest.h b/ui/gfx/image_unittest.h index 4324caa..c4941d1 100644 --- a/ui/gfx/image_unittest.h +++ b/ui/gfx/image_unittest.h @@ -13,7 +13,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #if defined(OS_LINUX) -#include "gfx/gtk_util.h" +#include "ui/gfx/gtk_util.h" #elif defined(OS_MACOSX) #include "base/mac/mac_util.h" #include "skia/ext/skia_utils_mac.h" |