summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-03 22:45:41 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-03 22:45:41 +0000
commitd353541f29a517a93d1b0fec023f5d12a05eade2 (patch)
treeed89daef5725a582ca4957f9b237c64113529501 /ppapi
parent724b3891cefbc629f9db168f9b39943dabc1cfe2 (diff)
downloadchromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.zip
chromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.tar.gz
chromium_src-d353541f29a517a93d1b0fec023f5d12a05eade2.tar.bz2
ui: Move surface/ directory out of gfx/, up to ui/.
BUG=104040 R=ben@chromium.org TBR=brettw@chromium.org Review URL: https://chromiumcodereview.appspot.com/10351002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/ppapi_proxy.gypi2
-rw-r--r--ppapi/ppapi_shared.gypi2
-rw-r--r--ppapi/ppapi_tests.gypi2
-rw-r--r--ppapi/proxy/DEPS2
-rw-r--r--ppapi/proxy/ppb_image_data_proxy.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi
index dd43216..0654072 100644
--- a/ppapi/ppapi_proxy.gypi
+++ b/ppapi/ppapi_proxy.gypi
@@ -14,7 +14,7 @@
'../gpu/gpu.gyp:gpu_ipc',
'../ipc/ipc.gyp:ipc',
'../skia/skia.gyp:skia',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'ppapi.gyp:ppapi_c',
'ppapi_shared',
],
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index 2866fed..cdd9fe3 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -29,7 +29,7 @@
'../third_party/icu/icu.gyp:icuuc',
# TODO(ananta) : The WebKit dependency needs to move to a new target for NACL.
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
],
'defines': [
'PPAPI_SHARED_IMPLEMENTATION',
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 56f9c66..10f30e6 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -171,7 +171,7 @@
'../ipc/ipc.gyp:test_support_ipc',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
],
'sources': [
'proxy/run_all_unittests.cc',
diff --git a/ppapi/proxy/DEPS b/ppapi/proxy/DEPS
index 1bfd52f..28be7cc 100644
--- a/ppapi/proxy/DEPS
+++ b/ppapi/proxy/DEPS
@@ -3,7 +3,7 @@ include_rules = [
"+ipc",
"+gpu",
"+skia",
- "+ui/gfx/surface",
+ "+ui/surface",
# We don't want the proxy to depend on the C++ layer, which is appropriate
# for plugins only. However, the completion callback factory is a very useful
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index bddf2e7..a92d599 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -23,7 +23,7 @@
#if !defined(OS_NACL)
#include "skia/ext/platform_canvas.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
#endif
namespace ppapi {